From cef059a918362ea4c687c024b1a2dc17cf2e7880 Mon Sep 17 00:00:00 2001
From: CristianoMafraJunior <cristiano.mafracontanto@gmail.com>
Date: Thu, 12 Dec 2024 15:31:45 -0300
Subject: [PATCH 1/4] [REF] l10n_br_base: company name

---
 l10n_br_base/demo/res_company_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/l10n_br_base/demo/res_company_demo.xml b/l10n_br_base/demo/res_company_demo.xml
index 47bc41a953dd..5e8d4c268578 100644
--- a/l10n_br_base/demo/res_company_demo.xml
+++ b/l10n_br_base/demo/res_company_demo.xml
@@ -59,8 +59,8 @@
 
     <!-- Empresa Simples Nacional -->
     <record id="simples_nacional_partner" model="res.partner">
-        <field name="name">TESTE - Simples Nacional</field>
-        <field name="company_name">TESTE - Simples Nacional</field>
+        <field name="name">Empresa Simples Nacional</field>
+        <field name="company_name">Empresa Simples Nacional</field>
         <field name="street_name">Rua Paulo Dias</field>
         <field name="street_number">586</field>
         <field name="district">Vila Santa Luzia</field>
@@ -80,8 +80,8 @@
     </function>
 
     <record id="empresa_simples_nacional" model="res.company">
-        <field name="name">TESTE - Simples Nacional</field>
-        <field name="legal_name">TESTE - Simples Nacional</field>
+        <field name="name">Empresa Simples Nacional</field>
+        <field name="legal_name">Empresa Simples Nacional</field>
         <field name="partner_id" ref="simples_nacional_partner" />
         <field name="currency_id" ref="base.BRL" />
     </record>

From 5facffaa444cf12b96141d1a350f058ed535456c Mon Sep 17 00:00:00 2001
From: CristianoMafraJunior <cristiano.mafracontanto@gmail.com>
Date: Thu, 12 Dec 2024 16:41:03 -0300
Subject: [PATCH 2/4] [REF]l10n_br_nfe: company name

---
 ...59594315000157550010000000012062777161.xml | 290 +++++++++---------
 1 file changed, 145 insertions(+), 145 deletions(-)

diff --git a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml
index 5d41dd15ff73..251d47c51d90 100644
--- a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml
+++ b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml
@@ -1,152 +1,152 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
   <infNFe versao="4.00" Id="NFe35200159594315000157550010000000012062777161">
-    <ide>
-      <cUF>35</cUF>
-      <cNF>06277716</cNF>
-      <natOp>Venda</natOp>
-      <mod>55</mod>
-      <serie>1</serie>
-      <nNF>1</nNF>
-      <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
-      <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
-      <tpNF>1</tpNF>
-      <idDest>1</idDest>
-      <cMunFG>3501152</cMunFG>
-      <tpImp>1</tpImp>
-      <tpEmis>1</tpEmis>
-      <cDV>1</cDV>
-      <tpAmb>2</tpAmb>
-      <finNFe>1</finNFe>
-      <indFinal>1</indFinal>
-      <indPres>0</indPres>
-      <procEmi>0</procEmi>
-      <verProc>Odoo Brasil OCA v14</verProc>
-    </ide>
-    <emit>
-      <CNPJ>59594315000157</CNPJ>
-      <xNome>TESTE - Simples Nacional</xNome>
-      <xFant>TESTE - Simples Nacional</xFant>
-      <enderEmit>
-        <xLgr>Rua Paulo Dias</xLgr>
-        <nro>586</nro>
-        <xBairro>Vila Santa Luzia</xBairro>
-        <cMun>3501152</cMun>
-        <xMun>Alumínio</xMun>
-        <UF>SP</UF>
-        <CEP>18125000</CEP>
-        <cPais>1058</cPais>
-        <xPais>Brasil</xPais>
-        <fone>2130109965</fone>
-      </enderEmit>
-      <IE>755338250133</IE>
-      <CRT>1</CRT>
-    </emit>
-    <dest>
-      <CNPJ>81493979000189</CNPJ>
-      <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
-      <enderDest>
-        <xLgr>Rua Samuel Morse</xLgr>
-        <nro>135</nro>
-        <xCpl>20º andar - Conjunto 151</xCpl>
-        <xBairro>Brooklin</xBairro>
-        <cMun>3550308</cMun>
-        <xMun>São Paulo</xMun>
-        <UF>SP</UF>
-        <CEP>04576060</CEP>
-        <cPais>1058</cPais>
-        <xPais>Brasil</xPais>
-        <fone>551134782150</fone>
-      </enderDest>
-      <indIEDest>1</indIEDest>
-      <IE>460429771334</IE>
-      <email>cliente1@cliente1.com.br</email>
-    </dest>
-    <det nItem="1">
-      <prod>
-        <cProd>E-COM11</cProd>
-        <cEAN>SEM GTIN</cEAN>
-        <xProd>Cabinet with Doors</xProd>
-        <NCM>94033000</NCM>
-        <CFOP>5102</CFOP>
-        <uCom>UN</uCom>
-        <qCom>1.0000</qCom>
-        <vUnCom>140.0000000000</vUnCom>
-        <vProd>140.00</vProd>
-        <cEANTrib>SEM GTIN</cEANTrib>
-        <uTrib>UN</uTrib>
-        <qTrib>1.0000</qTrib>
-        <vUnTrib>140.0000000000</vUnTrib>
-        <indTot>1</indTot>
-      </prod>
-      <imposto>
-        <ICMS>
-          <ICMSSN101>
-            <orig>0</orig>
-            <CSOSN>101</CSOSN>
-            <pCredSN>2.7000</pCredSN>
-            <vCredICMSSN>3.78</vCredICMSSN>
-          </ICMSSN101>
-        </ICMS>
-        <IPI>
-          <cEnq>999</cEnq>
-          <IPINT>
-            <CST>53</CST>
-          </IPINT>
-        </IPI>
-        <PIS>
-          <PISOutr>
-            <CST>49</CST>
-            <vBC>0.00</vBC>
-            <pPIS>0.0000</pPIS>
-            <vPIS>0.00</vPIS>
-          </PISOutr>
-        </PIS>
-        <COFINS>
-          <COFINSOutr>
-            <CST>49</CST>
-            <vBC>0.00</vBC>
-            <pCOFINS>0.0000</pCOFINS>
-            <vCOFINS>0.00</vCOFINS>
-          </COFINSOutr>
-        </COFINS>
-      </imposto>
-    </det>
-    <total>
-      <ICMSTot>
+  <ide>
+  <cUF>35</cUF>
+  <cNF>06277716</cNF>
+  <natOp>Venda</natOp>
+  <mod>55</mod>
+  <serie>1</serie>
+  <nNF>1</nNF>
+  <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+  <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
+  <tpNF>1</tpNF>
+  <idDest>1</idDest>
+  <cMunFG>3501152</cMunFG>
+  <tpImp>1</tpImp>
+  <tpEmis>1</tpEmis>
+  <cDV>1</cDV>
+  <tpAmb>2</tpAmb>
+  <finNFe>1</finNFe>
+  <indFinal>1</indFinal>
+  <indPres>0</indPres>
+  <procEmi>0</procEmi>
+  <verProc>Odoo Brasil OCA v14</verProc>
+</ide>
+  <emit>
+  <CNPJ>59594315000157</CNPJ>
+  <xNome>Empresa Simples Nacional</xNome>
+  <xFant>Empresa Simples Nacional</xFant>
+  <enderEmit>
+  <xLgr>Rua Paulo Dias</xLgr>
+  <nro>586</nro>
+  <xBairro>Vila Santa Luzia</xBairro>
+  <cMun>3501152</cMun>
+  <xMun>Alumínio</xMun>
+  <UF>SP</UF>
+  <CEP>18125000</CEP>
+  <cPais>1058</cPais>
+  <xPais>Brasil</xPais>
+  <fone>2130109965</fone>
+</enderEmit>
+  <IE>755338250133</IE>
+  <CRT>1</CRT>
+</emit>
+  <dest>
+  <CNPJ>81493979000189</CNPJ>
+  <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+  <enderDest>
+    <xLgr>Rua Samuel Morse</xLgr>
+    <nro>135</nro>
+    <xCpl>20º andar - Conjunto 151</xCpl>
+    <xBairro>Brooklin</xBairro>
+    <cMun>3550308</cMun>
+    <xMun>São Paulo</xMun>
+    <UF>SP</UF>
+    <CEP>04576060</CEP>
+    <cPais>1058</cPais>
+    <xPais>Brasil</xPais>
+    <fone>551134782150</fone>
+  </enderDest>
+  <indIEDest>1</indIEDest>
+  <IE>460429771334</IE>
+  <email>cliente1@cliente1.com.br</email>
+</dest>
+  <det nItem="1">
+  <prod>
+    <cProd>E-COM11</cProd>
+    <cEAN>SEM GTIN</cEAN>
+    <xProd>Cabinet with Doors</xProd>
+    <NCM>94033000</NCM>
+    <CFOP>5102</CFOP>
+    <uCom>UN</uCom>
+    <qCom>1.0000</qCom>
+    <vUnCom>140.0000000000</vUnCom>
+    <vProd>140.00</vProd>
+    <cEANTrib>SEM GTIN</cEANTrib>
+    <uTrib>UN</uTrib>
+    <qTrib>1.0000</qTrib>
+    <vUnTrib>140.0000000000</vUnTrib>
+    <indTot>1</indTot>
+  </prod>
+  <imposto>
+    <ICMS>
+      <ICMSSN101>
+        <orig>0</orig>
+        <CSOSN>101</CSOSN>
+        <pCredSN>2.7000</pCredSN>
+        <vCredICMSSN>3.78</vCredICMSSN>
+      </ICMSSN101>
+    </ICMS>
+    <IPI>
+      <cEnq>999</cEnq>
+      <IPINT>
+        <CST>53</CST>
+      </IPINT>
+    </IPI>
+    <PIS>
+      <PISOutr>
+        <CST>49</CST>
         <vBC>0.00</vBC>
-        <vICMS>0.00</vICMS>
-        <vICMSDeson>0.00</vICMSDeson>
-        <vFCP>0.00</vFCP>
-        <vBCST>0.00</vBCST>
-        <vST>0.00</vST>
-        <vFCPST>0.00</vFCPST>
-        <vFCPSTRet>0.00</vFCPSTRet>
-        <vProd>140.00</vProd>
-        <vFrete>0.00</vFrete>
-        <vSeg>0.00</vSeg>
-        <vDesc>0.00</vDesc>
-        <vII>0.00</vII>
-        <vIPI>0.00</vIPI>
-        <vIPIDevol>0.00</vIPIDevol>
+        <pPIS>0.0000</pPIS>
         <vPIS>0.00</vPIS>
+      </PISOutr>
+    </PIS>
+    <COFINS>
+      <COFINSOutr>
+        <CST>49</CST>
+        <vBC>0.00</vBC>
+        <pCOFINS>0.0000</pCOFINS>
         <vCOFINS>0.00</vCOFINS>
-        <vOutro>0.00</vOutro>
-        <vNF>140.00</vNF>
-      </ICMSTot>
-    </total>
-    <transp>
-      <modFrete>9</modFrete>
-    </transp>
-    <pag>
-      <detPag>
-        <indPag>0</indPag>
-        <tPag>01</tPag>
-        <vPag>140.00</vPag>
-      </detPag>
-    </pag>
-    <infAdic>
-      <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
-    </infAdic>
-  </infNFe>
+      </COFINSOutr>
+    </COFINS>
+  </imposto>
+</det>
+  <total>
+  <ICMSTot>
+    <vBC>0.00</vBC>
+    <vICMS>0.00</vICMS>
+    <vICMSDeson>0.00</vICMSDeson>
+    <vFCP>0.00</vFCP>
+    <vBCST>0.00</vBCST>
+    <vST>0.00</vST>
+    <vFCPST>0.00</vFCPST>
+    <vFCPSTRet>0.00</vFCPSTRet>
+    <vProd>140.00</vProd>
+    <vFrete>0.00</vFrete>
+    <vSeg>0.00</vSeg>
+    <vDesc>0.00</vDesc>
+    <vII>0.00</vII>
+    <vIPI>0.00</vIPI>
+    <vIPIDevol>0.00</vIPIDevol>
+    <vPIS>0.00</vPIS>
+    <vCOFINS>0.00</vCOFINS>
+    <vOutro>0.00</vOutro>
+    <vNF>140.00</vNF>
+  </ICMSTot>
+</total>
+  <transp>
+  <modFrete>9</modFrete>
+</transp>
+  <pag>
+  <detPag>
+    <indPag>0</indPag>
+    <tPag>01</tPag>
+    <vPag>140.00</vPag>
+  </detPag>
+</pag>
+  <infAdic>
+  <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
+</infAdic>
+</infNFe>
 </NFe>

From d03b7841a11dea1e22a18c6313f2f43331f65a7d Mon Sep 17 00:00:00 2001
From: CristianoMafraJunior <cristiano.mafracontanto@gmail.com>
Date: Thu, 12 Dec 2024 15:30:13 -0300
Subject: [PATCH 3/4] [FIX] l10n_br_stock: company name

---
 l10n_br_stock/__manifest__.py           |  1 +
 l10n_br_stock/demo/res_company_demo.xml | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 l10n_br_stock/demo/res_company_demo.xml

diff --git a/l10n_br_stock/__manifest__.py b/l10n_br_stock/__manifest__.py
index 1dfe3ff6a870..17b06798435c 100644
--- a/l10n_br_stock/__manifest__.py
+++ b/l10n_br_stock/__manifest__.py
@@ -11,6 +11,7 @@
         "demo/res_users_demo.xml",
         "demo/stock_location_demo.xml",
         "demo/stock_inventory_demo.xml",
+        "demo/res_company_demo.xml",
     ],
     "installable": True,
     "auto_install": False,
diff --git a/l10n_br_stock/demo/res_company_demo.xml b/l10n_br_stock/demo/res_company_demo.xml
new file mode 100644
index 000000000000..aa45556e0ed9
--- /dev/null
+++ b/l10n_br_stock/demo/res_company_demo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="base.main_company" model="res.company">
+        <field name="name">Sua Empresa (São Paulo)</field>
+    </record>
+
+    <record id="stock.res_company_1" model="res.company">
+        <field name="name">Sua Empresa (Chicago)</field>
+    </record>
+</odoo>

From 477bbf7d13ec83d2525f7549dd542ef259d84169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= <rvalyi@akretion.com>
Date: Tue, 7 Jan 2025 19:10:40 +0000
Subject: [PATCH 4/4] [REF] l10n_br_nfe: fix demo NFE files indentation

---
 ...59594315000157550010000000012062777161.xml | 290 ++++++++--------
 ...59594315000157550010000000022062777169.xml | 300 ++++++++---------
 ...59594315000157550010000000032062777166.xml | 305 ++++++++---------
 ...81583054000129550010000000052062777166.xml | 317 +++++++++---------
 ...054000129550010000000012760018057-nf-e.xml |   1 +
 5 files changed, 607 insertions(+), 606 deletions(-)

diff --git a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml
index 251d47c51d90..561c5a71c387 100644
--- a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml
+++ b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000012062777161.xml
@@ -1,152 +1,152 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
   <infNFe versao="4.00" Id="NFe35200159594315000157550010000000012062777161">
-  <ide>
-  <cUF>35</cUF>
-  <cNF>06277716</cNF>
-  <natOp>Venda</natOp>
-  <mod>55</mod>
-  <serie>1</serie>
-  <nNF>1</nNF>
-  <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
-  <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
-  <tpNF>1</tpNF>
-  <idDest>1</idDest>
-  <cMunFG>3501152</cMunFG>
-  <tpImp>1</tpImp>
-  <tpEmis>1</tpEmis>
-  <cDV>1</cDV>
-  <tpAmb>2</tpAmb>
-  <finNFe>1</finNFe>
-  <indFinal>1</indFinal>
-  <indPres>0</indPres>
-  <procEmi>0</procEmi>
-  <verProc>Odoo Brasil OCA v14</verProc>
-</ide>
-  <emit>
-  <CNPJ>59594315000157</CNPJ>
-  <xNome>Empresa Simples Nacional</xNome>
-  <xFant>Empresa Simples Nacional</xFant>
-  <enderEmit>
-  <xLgr>Rua Paulo Dias</xLgr>
-  <nro>586</nro>
-  <xBairro>Vila Santa Luzia</xBairro>
-  <cMun>3501152</cMun>
-  <xMun>Alumínio</xMun>
-  <UF>SP</UF>
-  <CEP>18125000</CEP>
-  <cPais>1058</cPais>
-  <xPais>Brasil</xPais>
-  <fone>2130109965</fone>
-</enderEmit>
-  <IE>755338250133</IE>
-  <CRT>1</CRT>
-</emit>
-  <dest>
-  <CNPJ>81493979000189</CNPJ>
-  <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
-  <enderDest>
-    <xLgr>Rua Samuel Morse</xLgr>
-    <nro>135</nro>
-    <xCpl>20º andar - Conjunto 151</xCpl>
-    <xBairro>Brooklin</xBairro>
-    <cMun>3550308</cMun>
-    <xMun>São Paulo</xMun>
-    <UF>SP</UF>
-    <CEP>04576060</CEP>
-    <cPais>1058</cPais>
-    <xPais>Brasil</xPais>
-    <fone>551134782150</fone>
-  </enderDest>
-  <indIEDest>1</indIEDest>
-  <IE>460429771334</IE>
-  <email>cliente1@cliente1.com.br</email>
-</dest>
-  <det nItem="1">
-  <prod>
-    <cProd>E-COM11</cProd>
-    <cEAN>SEM GTIN</cEAN>
-    <xProd>Cabinet with Doors</xProd>
-    <NCM>94033000</NCM>
-    <CFOP>5102</CFOP>
-    <uCom>UN</uCom>
-    <qCom>1.0000</qCom>
-    <vUnCom>140.0000000000</vUnCom>
-    <vProd>140.00</vProd>
-    <cEANTrib>SEM GTIN</cEANTrib>
-    <uTrib>UN</uTrib>
-    <qTrib>1.0000</qTrib>
-    <vUnTrib>140.0000000000</vUnTrib>
-    <indTot>1</indTot>
-  </prod>
-  <imposto>
-    <ICMS>
-      <ICMSSN101>
-        <orig>0</orig>
-        <CSOSN>101</CSOSN>
-        <pCredSN>2.7000</pCredSN>
-        <vCredICMSSN>3.78</vCredICMSSN>
-      </ICMSSN101>
-    </ICMS>
-    <IPI>
-      <cEnq>999</cEnq>
-      <IPINT>
-        <CST>53</CST>
-      </IPINT>
-    </IPI>
-    <PIS>
-      <PISOutr>
-        <CST>49</CST>
+    <ide>
+      <cUF>35</cUF>
+      <cNF>06277716</cNF>
+      <natOp>Venda</natOp>
+      <mod>55</mod>
+      <serie>1</serie>
+      <nNF>1</nNF>
+      <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+      <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
+      <tpNF>1</tpNF>
+      <idDest>1</idDest>
+      <cMunFG>3501152</cMunFG>
+      <tpImp>1</tpImp>
+      <tpEmis>1</tpEmis>
+      <cDV>1</cDV>
+      <tpAmb>2</tpAmb>
+      <finNFe>1</finNFe>
+      <indFinal>1</indFinal>
+      <indPres>0</indPres>
+      <procEmi>0</procEmi>
+      <verProc>Odoo Brasil OCA v14</verProc>
+    </ide>
+    <emit>
+      <CNPJ>59594315000157</CNPJ>
+      <xNome>Empresa Simples Nacional</xNome>
+      <xFant>Empresa Simples Nacional</xFant>
+      <enderEmit>
+        <xLgr>Rua Paulo Dias</xLgr>
+        <nro>586</nro>
+        <xBairro>Vila Santa Luzia</xBairro>
+        <cMun>3501152</cMun>
+        <xMun>Alumínio</xMun>
+        <UF>SP</UF>
+        <CEP>18125000</CEP>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+        <fone>2130109965</fone>
+      </enderEmit>
+      <IE>755338250133</IE>
+      <CRT>1</CRT>
+    </emit>
+    <dest>
+      <CNPJ>81493979000189</CNPJ>
+      <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <enderDest>
+        <xLgr>Rua Samuel Morse</xLgr>
+        <nro>135</nro>
+        <xCpl>20º andar - Conjunto 151</xCpl>
+        <xBairro>Brooklin</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <UF>SP</UF>
+        <CEP>04576060</CEP>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+        <fone>551134782150</fone>
+      </enderDest>
+      <indIEDest>1</indIEDest>
+      <IE>460429771334</IE>
+      <email>cliente1@cliente1.com.br</email>
+    </dest>
+    <det nItem="1">
+      <prod>
+        <cProd>E-COM11</cProd>
+        <cEAN>SEM GTIN</cEAN>
+        <xProd>Cabinet with Doors</xProd>
+        <NCM>94033000</NCM>
+        <CFOP>5102</CFOP>
+        <uCom>UN</uCom>
+        <qCom>1.0000</qCom>
+        <vUnCom>140.0000000000</vUnCom>
+        <vProd>140.00</vProd>
+        <cEANTrib>SEM GTIN</cEANTrib>
+        <uTrib>UN</uTrib>
+        <qTrib>1.0000</qTrib>
+        <vUnTrib>140.0000000000</vUnTrib>
+        <indTot>1</indTot>
+      </prod>
+      <imposto>
+        <ICMS>
+          <ICMSSN101>
+            <orig>0</orig>
+            <CSOSN>101</CSOSN>
+            <pCredSN>2.7000</pCredSN>
+            <vCredICMSSN>3.78</vCredICMSSN>
+          </ICMSSN101>
+        </ICMS>
+        <IPI>
+          <cEnq>999</cEnq>
+          <IPINT>
+            <CST>53</CST>
+          </IPINT>
+        </IPI>
+        <PIS>
+          <PISOutr>
+            <CST>49</CST>
+            <vBC>0.00</vBC>
+            <pPIS>0.0000</pPIS>
+            <vPIS>0.00</vPIS>
+          </PISOutr>
+        </PIS>
+        <COFINS>
+          <COFINSOutr>
+            <CST>49</CST>
+            <vBC>0.00</vBC>
+            <pCOFINS>0.0000</pCOFINS>
+            <vCOFINS>0.00</vCOFINS>
+          </COFINSOutr>
+        </COFINS>
+      </imposto>
+    </det>
+    <total>
+      <ICMSTot>
         <vBC>0.00</vBC>
-        <pPIS>0.0000</pPIS>
+        <vICMS>0.00</vICMS>
+        <vICMSDeson>0.00</vICMSDeson>
+        <vFCP>0.00</vFCP>
+        <vBCST>0.00</vBCST>
+        <vST>0.00</vST>
+        <vFCPST>0.00</vFCPST>
+        <vFCPSTRet>0.00</vFCPSTRet>
+        <vProd>140.00</vProd>
+        <vFrete>0.00</vFrete>
+        <vSeg>0.00</vSeg>
+        <vDesc>0.00</vDesc>
+        <vII>0.00</vII>
+        <vIPI>0.00</vIPI>
+        <vIPIDevol>0.00</vIPIDevol>
         <vPIS>0.00</vPIS>
-      </PISOutr>
-    </PIS>
-    <COFINS>
-      <COFINSOutr>
-        <CST>49</CST>
-        <vBC>0.00</vBC>
-        <pCOFINS>0.0000</pCOFINS>
         <vCOFINS>0.00</vCOFINS>
-      </COFINSOutr>
-    </COFINS>
-  </imposto>
-</det>
-  <total>
-  <ICMSTot>
-    <vBC>0.00</vBC>
-    <vICMS>0.00</vICMS>
-    <vICMSDeson>0.00</vICMSDeson>
-    <vFCP>0.00</vFCP>
-    <vBCST>0.00</vBCST>
-    <vST>0.00</vST>
-    <vFCPST>0.00</vFCPST>
-    <vFCPSTRet>0.00</vFCPSTRet>
-    <vProd>140.00</vProd>
-    <vFrete>0.00</vFrete>
-    <vSeg>0.00</vSeg>
-    <vDesc>0.00</vDesc>
-    <vII>0.00</vII>
-    <vIPI>0.00</vIPI>
-    <vIPIDevol>0.00</vIPIDevol>
-    <vPIS>0.00</vPIS>
-    <vCOFINS>0.00</vCOFINS>
-    <vOutro>0.00</vOutro>
-    <vNF>140.00</vNF>
-  </ICMSTot>
-</total>
-  <transp>
-  <modFrete>9</modFrete>
-</transp>
-  <pag>
-  <detPag>
-    <indPag>0</indPag>
-    <tPag>01</tPag>
-    <vPag>140.00</vPag>
-  </detPag>
-</pag>
-  <infAdic>
-  <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
-</infAdic>
-</infNFe>
+        <vOutro>0.00</vOutro>
+        <vNF>140.00</vNF>
+      </ICMSTot>
+    </total>
+    <transp>
+      <modFrete>9</modFrete>
+    </transp>
+    <pag>
+      <detPag>
+        <indPag>0</indPag>
+        <tPag>01</tPag>
+        <vPag>140.00</vPag>
+      </detPag>
+    </pag>
+    <infAdic>
+      <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
+    </infAdic>
+  </infNFe>
 </NFe>
diff --git a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000022062777169.xml b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000022062777169.xml
index 259c95c08712..f4580cecad48 100644
--- a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000022062777169.xml
+++ b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000022062777169.xml
@@ -1,153 +1,153 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
-    <infNFe versao="4.00" Id="NFe35200159594315000157550010000000022062777169">
-        <ide>
-            <cUF>35</cUF>
-            <cNF>06277716</cNF>
-            <natOp>Venda</natOp>
-            <mod>55</mod>
-            <serie>1</serie>
-            <nNF>2</nNF>
-            <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
-            <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
-            <tpNF>1</tpNF>
-            <idDest>1</idDest>
-            <cMunFG>3550308</cMunFG>
-            <tpImp>1</tpImp>
-            <tpEmis>1</tpEmis>
-            <cDV>9</cDV>
-            <tpAmb>2</tpAmb>
-            <finNFe>1</finNFe>
-            <indFinal>1</indFinal>
-            <indPres>0</indPres>
-            <procEmi>0</procEmi>
-            <verProc>Odoo Brasil OCA v14</verProc>
-        </ide>
-        <emit>
-            <CNPJ>81583054000129</CNPJ>
-            <xNome>Empresa Lucro Presumido Ltda</xNome>
-            <xFant>Empresa Lucro Presumido</xFant>
-            <enderEmit>
-                <xLgr>Avenida Paulista</xLgr>
-                <nro>1</nro>
-                <xBairro>Bela Vista</xBairro>
-                <cMun>3550308</cMun>
-                <xMun>São Paulo</xMun>
-                <UF>SP</UF>
-                <CEP>01311000</CEP>
-                <cPais>1058</cPais>
-                <xPais>Brasil</xPais>
-                <fone>551199999999</fone>
-            </enderEmit>
-            <IE>078016350838</IE>
-            <CRT>3</CRT>
-        </emit>
-        <dest>
-            <CPF>76586507812</CPF>
-            <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
-            <enderDest>
-                <xLgr>Rua do Bosque</xLgr>
-                <nro>238</nro>
-                <xBairro>Barra Funda</xBairro>
-                <cMun>3550308</cMun>
-                <xMun>São Paulo</xMun>
-                <UF>SP</UF>
-                <CEP>01136000</CEP>
-                <cPais>1058</cPais>
-                <xPais>Brasil</xPais>
-                <fone>1138817417</fone>
-            </enderDest>
-            <indIEDest>1</indIEDest>
-            <email>cliente11@cliente11.com.br</email>
-        </dest>
-        <det nItem="1">
-            <prod>
-                <cProd>FURN_9001</cProd>
-                <cEAN>SEM GTIN</cEAN>
-                <xProd>Flipover</xProd>
-                <NCM>96100000</NCM>
-                <CFOP>5102</CFOP>
-                <uCom>UN</uCom>
-                <qCom>1.0000</qCom>
-                <vUnCom>1950.0000000000</vUnCom>
-                <vProd>1950.00</vProd>
-                <cEANTrib>SEM GTIN</cEANTrib>
-                <uTrib>UN</uTrib>
-                <qTrib>1.0000</qTrib>
-                <vUnTrib>1950.0000000000</vUnTrib>
-                <indTot>1</indTot>
-            </prod>
-            <imposto>
-                <ICMS>
-                    <ICMS20>
-                        <orig>0</orig>
-                        <CST>20</CST>
-                        <modBC>0</modBC>
-                        <pRedBC>51.1100</pRedBC>
-                        <vBC>953.36</vBC>
-                        <pICMS>18.0000</pICMS>
-                        <vICMS>171.60</vICMS>
-                    </ICMS20>
-                </ICMS>
-                <IPI>
-                    <cEnq>999</cEnq>
-                    <IPINT>
-                        <CST>53</CST>
-                    </IPINT>
-                </IPI>
-                <PIS>
-                    <PISAliq>
-                        <CST>01</CST>
-                        <vBC>1950.00</vBC>
-                        <pPIS>0.6500</pPIS>
-                        <vPIS>12.68</vPIS>
-                    </PISAliq>
-                </PIS>
-                <COFINS>
-                    <COFINSAliq>
-                        <CST>01</CST>
-                        <vBC>1950.00</vBC>
-                        <pCOFINS>3.0000</pCOFINS>
-                        <vCOFINS>58.50</vCOFINS>
-                    </COFINSAliq>
-                </COFINS>
-            </imposto>
-        </det>
-        <total>
-            <ICMSTot>
-                <vBC>953.36</vBC>
-                <vICMS>171.60</vICMS>
-                <vICMSDeson>0.00</vICMSDeson>
-                <vFCP>0.00</vFCP>
-                <vBCST>0.00</vBCST>
-                <vST>0.00</vST>
-                <vFCPST>0.00</vFCPST>
-                <vFCPSTRet>0.00</vFCPSTRet>
-                <vProd>1950.00</vProd>
-                <vFrete>0.00</vFrete>
-                <vSeg>0.00</vSeg>
-                <vDesc>0.00</vDesc>
-                <vII>0.00</vII>
-                <vIPI>0.00</vIPI>
-                <vIPIDevol>0.00</vIPIDevol>
-                <vPIS>12.68</vPIS>
-                <vCOFINS>58.50</vCOFINS>
-                <vOutro>0.00</vOutro>
-                <vNF>1950.00</vNF>
-            </ICMSTot>
-        </total>
-        <transp>
-            <modFrete>9</modFrete>
-        </transp>
-        <pag>
-            <detPag>
-                <indPag>0</indPag>
-                <tPag>01</tPag>
-                <vPag>1950.00</vPag>
-            </detPag>
-        </pag>
-        <infAdic>
-            <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
-        </infAdic>
-    </infNFe>
+  <infNFe versao="4.00" Id="NFe35200159594315000157550010000000022062777169">
+    <ide>
+      <cUF>35</cUF>
+      <cNF>06277716</cNF>
+      <natOp>Venda</natOp>
+      <mod>55</mod>
+      <serie>1</serie>
+      <nNF>2</nNF>
+      <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+      <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
+      <tpNF>1</tpNF>
+      <idDest>1</idDest>
+      <cMunFG>3550308</cMunFG>
+      <tpImp>1</tpImp>
+      <tpEmis>1</tpEmis>
+      <cDV>9</cDV>
+      <tpAmb>2</tpAmb>
+      <finNFe>1</finNFe>
+      <indFinal>1</indFinal>
+      <indPres>0</indPres>
+      <procEmi>0</procEmi>
+      <verProc>Odoo Brasil OCA v14</verProc>
+    </ide>
+    <emit>
+      <CNPJ>81583054000129</CNPJ>
+      <xNome>Empresa Lucro Presumido Ltda</xNome>
+      <xFant>Empresa Lucro Presumido</xFant>
+      <enderEmit>
+        <xLgr>Avenida Paulista</xLgr>
+        <nro>1</nro>
+        <xBairro>Bela Vista</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <UF>SP</UF>
+        <CEP>01311000</CEP>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+        <fone>551199999999</fone>
+      </enderEmit>
+      <IE>078016350838</IE>
+      <CRT>3</CRT>
+    </emit>
+    <dest>
+      <CPF>76586507812</CPF>
+      <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <enderDest>
+        <xLgr>Rua do Bosque</xLgr>
+        <nro>238</nro>
+        <xBairro>Barra Funda</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <UF>SP</UF>
+        <CEP>01136000</CEP>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+        <fone>1138817417</fone>
+      </enderDest>
+      <indIEDest>1</indIEDest>
+      <email>cliente11@cliente11.com.br</email>
+    </dest>
+    <det nItem="1">
+      <prod>
+        <cProd>FURN_9001</cProd>
+        <cEAN>SEM GTIN</cEAN>
+        <xProd>Flipover</xProd>
+        <NCM>96100000</NCM>
+        <CFOP>5102</CFOP>
+        <uCom>UN</uCom>
+        <qCom>1.0000</qCom>
+        <vUnCom>1950.0000000000</vUnCom>
+        <vProd>1950.00</vProd>
+        <cEANTrib>SEM GTIN</cEANTrib>
+        <uTrib>UN</uTrib>
+        <qTrib>1.0000</qTrib>
+        <vUnTrib>1950.0000000000</vUnTrib>
+        <indTot>1</indTot>
+      </prod>
+      <imposto>
+        <ICMS>
+          <ICMS20>
+            <orig>0</orig>
+            <CST>20</CST>
+            <modBC>0</modBC>
+            <pRedBC>51.1100</pRedBC>
+            <vBC>953.36</vBC>
+            <pICMS>18.0000</pICMS>
+            <vICMS>171.60</vICMS>
+          </ICMS20>
+        </ICMS>
+        <IPI>
+          <cEnq>999</cEnq>
+          <IPINT>
+            <CST>53</CST>
+          </IPINT>
+        </IPI>
+        <PIS>
+          <PISAliq>
+            <CST>01</CST>
+            <vBC>1950.00</vBC>
+            <pPIS>0.6500</pPIS>
+            <vPIS>12.68</vPIS>
+          </PISAliq>
+        </PIS>
+        <COFINS>
+          <COFINSAliq>
+            <CST>01</CST>
+            <vBC>1950.00</vBC>
+            <pCOFINS>3.0000</pCOFINS>
+            <vCOFINS>58.50</vCOFINS>
+          </COFINSAliq>
+        </COFINS>
+      </imposto>
+    </det>
+    <total>
+      <ICMSTot>
+        <vBC>953.36</vBC>
+        <vICMS>171.60</vICMS>
+        <vICMSDeson>0.00</vICMSDeson>
+        <vFCP>0.00</vFCP>
+        <vBCST>0.00</vBCST>
+        <vST>0.00</vST>
+        <vFCPST>0.00</vFCPST>
+        <vFCPSTRet>0.00</vFCPSTRet>
+        <vProd>1950.00</vProd>
+        <vFrete>0.00</vFrete>
+        <vSeg>0.00</vSeg>
+        <vDesc>0.00</vDesc>
+        <vII>0.00</vII>
+        <vIPI>0.00</vIPI>
+        <vIPIDevol>0.00</vIPIDevol>
+        <vPIS>12.68</vPIS>
+        <vCOFINS>58.50</vCOFINS>
+        <vOutro>0.00</vOutro>
+        <vNF>1950.00</vNF>
+      </ICMSTot>
+    </total>
+    <transp>
+      <modFrete>9</modFrete>
+    </transp>
+    <pag>
+      <detPag>
+        <indPag>0</indPag>
+        <tPag>01</tPag>
+        <vPag>1950.00</vPag>
+      </detPag>
+    </pag>
+    <infAdic>
+      <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
+    </infAdic>
+  </infNFe>
 </NFe>
diff --git a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000032062777166.xml b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000032062777166.xml
index e4ae942005c4..4d6e966c939e 100644
--- a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000032062777166.xml
+++ b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200159594315000157550010000000032062777166.xml
@@ -1,154 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
-    <infNFe versao="4.00" Id="NFe35200159594315000157550010000000032062777166">
-        <ide>
-            <cUF>35</cUF>
-            <cNF>06277716</cNF>
-            <natOp>Venda</natOp>
-            <mod>55</mod>
-            <serie>1</serie>
-            <nNF>3</nNF>
-            <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
-            <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
-            <tpNF>1</tpNF>
-            <idDest>2</idDest>
-            <cMunFG>3550308</cMunFG>
-            <tpImp>1</tpImp>
-            <tpEmis>1</tpEmis>
-            <cDV>6</cDV>
-            <tpAmb>2</tpAmb>
-            <finNFe>1</finNFe>
-            <indFinal>1</indFinal>
-            <indPres>0</indPres>
-            <procEmi>0</procEmi>
-            <verProc>Odoo Brasil OCA v14</verProc>
-        </ide>
-        <emit>
-            <CNPJ>81583054000129</CNPJ>
-            <xNome>Empresa Lucro Presumido Ltda</xNome>
-            <xFant>Empresa Lucro Presumido</xFant>
-            <enderEmit>
-                <xLgr>Avenida Paulista</xLgr>
-                <nro>1</nro>
-                <xBairro>Bela Vista</xBairro>
-                <cMun>3550308</cMun>
-                <xMun>São Paulo</xMun>
-                <UF>SP</UF>
-                <CEP>01311000</CEP>
-                <cPais>1058</cPais>
-                <xPais>Brasil</xPais>
-                <fone>551199999999</fone>
-            </enderEmit>
-            <IE>078016350838</IE>
-            <CRT>3</CRT>
-        </emit>
-        <dest>
-            <CNPJ>84148732000113</CNPJ>
-            <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
-            <enderDest>
-                <xLgr>Avenida Javari</xLgr>
-                <nro>s/n</nro>
-                <xCpl>Lote 9.45/15E</xCpl>
-                <xBairro>Distrito Industrial</xBairro>
-                <cMun>1302603</cMun>
-                <xMun>Manaus</xMun>
-                <UF>AM</UF>
-                <CEP>69075110</CEP>
-                <cPais>1058</cPais>
-                <xPais>Brasil</xPais>
-                <fone>9221458888</fone>
-            </enderDest>
-            <indIEDest>1</indIEDest>
-            <IE>095693211</IE>
-            <ISUF>100695108</ISUF>
-            <email>cliente4@cliente4.com.br</email>
-        </dest>
-        <det nItem="1">
-            <prod>
-                <cProd>E-COM10</cProd>
-                <cEAN>SEM GTIN</cEAN>
-                <xProd>Pedal Bin</xProd>
-                <NCM>73239900</NCM>
-                <CFOP>6102</CFOP>
-                <uCom>UN</uCom>
-                <qCom>2.0000</qCom>
-                <vUnCom>47.0000000000</vUnCom>
-                <vProd>94.00</vProd>
-                <cEANTrib>SEM GTIN</cEANTrib>
-                <uTrib>UN</uTrib>
-                <qTrib>2.0000</qTrib>
-                <vUnTrib>47.0000000000</vUnTrib>
-                <indTot>1</indTot>
-            </prod>
-            <imposto>
-                <ICMS>
-                    <ICMS00>
-                        <orig>2</orig>
-                        <CST>00</CST>
-                        <modBC>0</modBC>
-                        <vBC>94.00</vBC>
-                        <pICMS>4.0000</pICMS>
-                        <vICMS>3.76</vICMS>
-                    </ICMS00>
-                </ICMS>
-                <IPI>
-                    <cEnq>999</cEnq>
-                    <IPINT>
-                        <CST>53</CST>
-                    </IPINT>
-                </IPI>
-                <PIS>
-                    <PISAliq>
-                        <CST>01</CST>
-                        <vBC>94.00</vBC>
-                        <pPIS>0.6500</pPIS>
-                        <vPIS>0.61</vPIS>
-                    </PISAliq>
-                </PIS>
-                <COFINS>
-                    <COFINSAliq>
-                        <CST>01</CST>
-                        <vBC>94.00</vBC>
-                        <pCOFINS>3.0000</pCOFINS>
-                        <vCOFINS>2.82</vCOFINS>
-                    </COFINSAliq>
-                </COFINS>
-            </imposto>
-        </det>
-        <total>
-            <ICMSTot>
-                <vBC>94.00</vBC>
-                <vICMS>3.76</vICMS>
-                <vICMSDeson>0.00</vICMSDeson>
-                <vFCP>0.00</vFCP>
-                <vBCST>0.00</vBCST>
-                <vST>0.00</vST>
-                <vFCPST>0.00</vFCPST>
-                <vFCPSTRet>0.00</vFCPSTRet>
-                <vProd>94.00</vProd>
-                <vFrete>0.00</vFrete>
-                <vSeg>0.00</vSeg>
-                <vDesc>0.00</vDesc>
-                <vII>0.00</vII>
-                <vIPI>0.00</vIPI>
-                <vIPIDevol>0.00</vIPIDevol>
-                <vPIS>0.61</vPIS>
-                <vCOFINS>2.82</vCOFINS>
-                <vOutro>0.00</vOutro>
-                <vNF>94.00</vNF>
-            </ICMSTot>
-        </total>
-        <transp>
-            <modFrete>9</modFrete>
-        </transp>
-        <pag>
-            <detPag>
-                <indPag>0</indPag>
-                <tPag>01</tPag>
-                <vPag>94.00</vPag>
-            </detPag>
-        </pag>
-        <infAdic>
-            <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
-        </infAdic>
-    </infNFe>
+  <infNFe versao="4.00" Id="NFe35200159594315000157550010000000032062777166">
+    <ide>
+      <cUF>35</cUF>
+      <cNF>06277716</cNF>
+      <natOp>Venda</natOp>
+      <mod>55</mod>
+      <serie>1</serie>
+      <nNF>3</nNF>
+      <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+      <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
+      <tpNF>1</tpNF>
+      <idDest>2</idDest>
+      <cMunFG>3550308</cMunFG>
+      <tpImp>1</tpImp>
+      <tpEmis>1</tpEmis>
+      <cDV>6</cDV>
+      <tpAmb>2</tpAmb>
+      <finNFe>1</finNFe>
+      <indFinal>1</indFinal>
+      <indPres>0</indPres>
+      <procEmi>0</procEmi>
+      <verProc>Odoo Brasil OCA v14</verProc>
+    </ide>
+    <emit>
+      <CNPJ>81583054000129</CNPJ>
+      <xNome>Empresa Lucro Presumido Ltda</xNome>
+      <xFant>Empresa Lucro Presumido</xFant>
+      <enderEmit>
+        <xLgr>Avenida Paulista</xLgr>
+        <nro>1</nro>
+        <xBairro>Bela Vista</xBairro>
+        <cMun>3550308</cMun>
+        <xMun>São Paulo</xMun>
+        <UF>SP</UF>
+        <CEP>01311000</CEP>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+        <fone>551199999999</fone>
+      </enderEmit>
+      <IE>078016350838</IE>
+      <CRT>3</CRT>
+    </emit>
+    <dest>
+      <CNPJ>84148732000113</CNPJ>
+      <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+      <enderDest>
+        <xLgr>Avenida Javari</xLgr>
+        <nro>s/n</nro>
+        <xCpl>Lote 9.45/15E</xCpl>
+        <xBairro>Distrito Industrial</xBairro>
+        <cMun>1302603</cMun>
+        <xMun>Manaus</xMun>
+        <UF>AM</UF>
+        <CEP>69075110</CEP>
+        <cPais>1058</cPais>
+        <xPais>Brasil</xPais>
+        <fone>9221458888</fone>
+      </enderDest>
+      <indIEDest>1</indIEDest>
+      <IE>095693211</IE>
+      <ISUF>100695108</ISUF>
+      <email>cliente4@cliente4.com.br</email>
+    </dest>
+    <det nItem="1">
+      <prod>
+        <cProd>E-COM10</cProd>
+        <cEAN>SEM GTIN</cEAN>
+        <xProd>Pedal Bin</xProd>
+        <NCM>73239900</NCM>
+        <CFOP>6102</CFOP>
+        <uCom>UN</uCom>
+        <qCom>2.0000</qCom>
+        <vUnCom>47.0000000000</vUnCom>
+        <vProd>94.00</vProd>
+        <cEANTrib>SEM GTIN</cEANTrib>
+        <uTrib>UN</uTrib>
+        <qTrib>2.0000</qTrib>
+        <vUnTrib>47.0000000000</vUnTrib>
+        <indTot>1</indTot>
+      </prod>
+      <imposto>
+        <ICMS>
+          <ICMS00>
+            <orig>2</orig>
+            <CST>00</CST>
+            <modBC>0</modBC>
+            <vBC>94.00</vBC>
+            <pICMS>4.0000</pICMS>
+            <vICMS>3.76</vICMS>
+          </ICMS00>
+        </ICMS>
+        <IPI>
+          <cEnq>999</cEnq>
+          <IPINT>
+            <CST>53</CST>
+          </IPINT>
+        </IPI>
+        <PIS>
+          <PISAliq>
+            <CST>01</CST>
+            <vBC>94.00</vBC>
+            <pPIS>0.6500</pPIS>
+            <vPIS>0.61</vPIS>
+          </PISAliq>
+        </PIS>
+        <COFINS>
+          <COFINSAliq>
+            <CST>01</CST>
+            <vBC>94.00</vBC>
+            <pCOFINS>3.0000</pCOFINS>
+            <vCOFINS>2.82</vCOFINS>
+          </COFINSAliq>
+        </COFINS>
+      </imposto>
+    </det>
+    <total>
+      <ICMSTot>
+        <vBC>94.00</vBC>
+        <vICMS>3.76</vICMS>
+        <vICMSDeson>0.00</vICMSDeson>
+        <vFCP>0.00</vFCP>
+        <vBCST>0.00</vBCST>
+        <vST>0.00</vST>
+        <vFCPST>0.00</vFCPST>
+        <vFCPSTRet>0.00</vFCPSTRet>
+        <vProd>94.00</vProd>
+        <vFrete>0.00</vFrete>
+        <vSeg>0.00</vSeg>
+        <vDesc>0.00</vDesc>
+        <vII>0.00</vII>
+        <vIPI>0.00</vIPI>
+        <vIPIDevol>0.00</vIPIDevol>
+        <vPIS>0.61</vPIS>
+        <vCOFINS>2.82</vCOFINS>
+        <vOutro>0.00</vOutro>
+        <vNF>94.00</vNF>
+      </ICMSTot>
+    </total>
+    <transp>
+      <modFrete>9</modFrete>
+    </transp>
+    <pag>
+      <detPag>
+        <indPag>0</indPag>
+        <tPag>01</tPag>
+        <vPag>94.00</vPag>
+      </detPag>
+    </pag>
+    <infAdic>
+      <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
+    </infAdic>
+  </infNFe>
 </NFe>
diff --git a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml
index f59f22ea44ce..c0cb361600b8 100644
--- a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml
+++ b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200181583054000129550010000000052062777166.xml
@@ -1,161 +1,160 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<nfeProc versao="4.00" xmlns="http://www.portalfiscal.inf.br/nfe">
-    <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
-        <infNFe versao="4.00" Id="NFe35200181583054000129550010000000052062777166">
-            <ide>
-                <cUF>35</cUF>
-                <cNF>06277716</cNF>
-                <natOp>Venda</natOp>
-                <mod>55</mod>
-                <serie>1</serie>
-                <nNF>5</nNF>
-                <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
-                <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
-                <tpNF>1</tpNF>
-                <idDest>1</idDest>
-                <cMunFG>3501152</cMunFG>
-                <tpImp>1</tpImp>
-                <tpEmis>1</tpEmis>
-                <cDV>1</cDV>
-                <tpAmb>2</tpAmb>
-                <finNFe>1</finNFe>
-                <indFinal>1</indFinal>
-                <indPres>0</indPres>
-                <procEmi>0</procEmi>
-                <verProc>Odoo Brasil OCA 12.0</verProc>
-            </ide>
-            <emit>
-                <CNPJ>81583054000129</CNPJ>
-                <xNome>Empresa Lucro Presumido Ltda</xNome>
-                <xFant>Empresa Lucro Presumido</xFant>
-                <enderEmit>
-                    <xLgr>Avenida Paulista</xLgr>
-                    <nro>1</nro>
-                    <xBairro>Bela Vista</xBairro>
-                    <cMun>3550308</cMun>
-                    <xMun>São Paulo</xMun>
-                    <UF>SP</UF>
-                    <CEP>01311000</CEP>
-                    <cPais>1058</cPais>
-                    <xPais>Brasil</xPais>
-                    <fone>551199999999</fone>
-                </enderEmit>
-                <IE>078016350838</IE>
-                <CRT>3</CRT>
-            </emit>
-            <dest>
-                <CNPJ>81493979000189</CNPJ>
-                <xNome
-                >NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
-                <enderDest>
-                    <xLgr>Rua Samuel Morse</xLgr>
-                    <nro>135</nro>
-                    <xCpl>20º andar - Conjunto 151</xCpl>
-                    <xBairro>Brooklin</xBairro>
-                    <cMun>3550308</cMun>
-                    <xMun>São Paulo</xMun>
-                    <UF>SP</UF>
-                    <CEP>04576060</CEP>
-                    <cPais>1058</cPais>
-                    <xPais>Brasil</xPais>
-                    <fone>551134782150</fone>
-                </enderDest>
-                <indIEDest>1</indIEDest>
-                <IE>460429771334</IE>
-                <email>cliente1@cliente1.com.br</email>
-            </dest>
-            <det nItem="1">
-                <prod>
-                    <cProd>E-COM11</cProd>
-                    <cEAN>SEM GTIN</cEAN>
-                    <xProd>Cabinet with Doors</xProd>
-                    <NCM>94033000</NCM>
-                    <CFOP>5102</CFOP>
-                    <uCom>UNID</uCom>
-                    <qCom>1.0000</qCom>
-                    <vUnCom>14.0000000000</vUnCom>
-                    <vProd>14.00</vProd>
-                    <cEANTrib>SEM GTIN</cEANTrib>
-                    <uTrib>UNID</uTrib>
-                    <qTrib>1.0000</qTrib>
-                    <vUnTrib>14.0000000000</vUnTrib>
-                    <indTot>1</indTot>
-                </prod>
-                <imposto>
-                    <vTotTrib>0.00</vTotTrib>
-                    <ICMS>
-                        <ICMSSN101>
-                            <orig>0</orig>
-                            <CSOSN>101</CSOSN>
-                            <pCredSN>2.7000</pCredSN>
-                            <vCredICMSSN>0.38</vCredICMSSN>
-                        </ICMSSN101>
-                    </ICMS>
-                    <IPI>
-                        <cEnq>999</cEnq>
-                        <IPINT>
-                            <CST>53</CST>
-                        </IPINT>
-                    </IPI>
-                    <PIS>
-                        <PISOutr>
-                            <CST>49</CST>
-                            <vBC>0.00</vBC>
-                            <pPIS>0.0000</pPIS>
-                            <vPIS>0.00</vPIS>
-                        </PISOutr>
-                    </PIS>
-                    <COFINS>
-                        <COFINSOutr>
-                            <CST>49</CST>
-                            <vBC>0.00</vBC>
-                            <pCOFINS>0.0000</pCOFINS>
-                            <vCOFINS>0.00</vCOFINS>
-                        </COFINSOutr>
-                    </COFINS>
-                </imposto>
-            </det>
-            <total>
-                <ICMSTot>
-                    <vBC>0.00</vBC>
-                    <vICMS>0.00</vICMS>
-                    <vICMSDeson>0.00</vICMSDeson>
-                    <vFCPUFDest>0.00</vFCPUFDest>
-                    <vICMSUFDest>0.00</vICMSUFDest>
-                    <vICMSUFRemet>0.00</vICMSUFRemet>
-                    <vFCP>0.00</vFCP>
-                    <vBCST>0.00</vBCST>
-                    <vST>0.00</vST>
-                    <vFCPST>0.00</vFCPST>
-                    <vFCPSTRet>0.00</vFCPSTRet>
-                    <vProd>14.00</vProd>
-                    <vFrete>0.00</vFrete>
-                    <vSeg>0.00</vSeg>
-                    <vDesc>0.00</vDesc>
-                    <vII>0.00</vII>
-                    <vIPI>0.00</vIPI>
-                    <vIPIDevol>0.00</vIPIDevol>
-                    <vPIS>0.00</vPIS>
-                    <vCOFINS>0.00</vCOFINS>
-                    <vOutro>0.00</vOutro>
-                    <vNF>14.00</vNF>
-                    <vTotTrib>0.00</vTotTrib>
-                </ICMSTot>
-            </total>
-            <transp>
-                <modFrete>9</modFrete>
-            </transp>
-            <pag>
-                <detPag>
-                    <indPag>0</indPag>
-                    <tPag>01</tPag>
-                    <vPag>14.00</vPag>
-                </detPag>
-                <vTroco>0.00</vTroco>
-            </pag>
-            <infAdic>
-                <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
-            </infAdic>
-        </infNFe>
-    </NFe>
+<nfeProc xmlns="http://www.portalfiscal.inf.br/nfe" versao="4.00">
+  <NFe>
+    <infNFe versao="4.00" Id="NFe35200181583054000129550010000000052062777166">
+      <ide>
+        <cUF>35</cUF>
+        <cNF>06277716</cNF>
+        <natOp>Venda</natOp>
+        <mod>55</mod>
+        <serie>1</serie>
+        <nNF>5</nNF>
+        <dhEmi>2020-01-01T12:00:00+01:00</dhEmi>
+        <dhSaiEnt>2020-01-01T12:00:00+01:00</dhSaiEnt>
+        <tpNF>1</tpNF>
+        <idDest>1</idDest>
+        <cMunFG>3501152</cMunFG>
+        <tpImp>1</tpImp>
+        <tpEmis>1</tpEmis>
+        <cDV>1</cDV>
+        <tpAmb>2</tpAmb>
+        <finNFe>1</finNFe>
+        <indFinal>1</indFinal>
+        <indPres>0</indPres>
+        <procEmi>0</procEmi>
+        <verProc>Odoo Brasil OCA 12.0</verProc>
+      </ide>
+      <emit>
+        <CNPJ>81583054000129</CNPJ>
+        <xNome>Empresa Lucro Presumido Ltda</xNome>
+        <xFant>Empresa Lucro Presumido</xFant>
+        <enderEmit>
+          <xLgr>Avenida Paulista</xLgr>
+          <nro>1</nro>
+          <xBairro>Bela Vista</xBairro>
+          <cMun>3550308</cMun>
+          <xMun>São Paulo</xMun>
+          <UF>SP</UF>
+          <CEP>01311000</CEP>
+          <cPais>1058</cPais>
+          <xPais>Brasil</xPais>
+          <fone>551199999999</fone>
+        </enderEmit>
+        <IE>078016350838</IE>
+        <CRT>3</CRT>
+      </emit>
+      <dest>
+        <CNPJ>81493979000189</CNPJ>
+        <xNome>NF-E EMITIDA EM AMBIENTE DE HOMOLOGACAO - SEM VALOR FISCAL</xNome>
+        <enderDest>
+          <xLgr>Rua Samuel Morse</xLgr>
+          <nro>135</nro>
+          <xCpl>20º andar - Conjunto 151</xCpl>
+          <xBairro>Brooklin</xBairro>
+          <cMun>3550308</cMun>
+          <xMun>São Paulo</xMun>
+          <UF>SP</UF>
+          <CEP>04576060</CEP>
+          <cPais>1058</cPais>
+          <xPais>Brasil</xPais>
+          <fone>551134782150</fone>
+        </enderDest>
+        <indIEDest>1</indIEDest>
+        <IE>460429771334</IE>
+        <email>cliente1@cliente1.com.br</email>
+      </dest>
+      <det nItem="1">
+        <prod>
+          <cProd>E-COM11</cProd>
+          <cEAN>SEM GTIN</cEAN>
+          <xProd>Cabinet with Doors</xProd>
+          <NCM>94033000</NCM>
+          <CFOP>5102</CFOP>
+          <uCom>UNID</uCom>
+          <qCom>1.0000</qCom>
+          <vUnCom>14.0000000000</vUnCom>
+          <vProd>14.00</vProd>
+          <cEANTrib>SEM GTIN</cEANTrib>
+          <uTrib>UNID</uTrib>
+          <qTrib>1.0000</qTrib>
+          <vUnTrib>14.0000000000</vUnTrib>
+          <indTot>1</indTot>
+        </prod>
+        <imposto>
+          <vTotTrib>0.00</vTotTrib>
+          <ICMS>
+            <ICMSSN101>
+              <orig>0</orig>
+              <CSOSN>101</CSOSN>
+              <pCredSN>2.7000</pCredSN>
+              <vCredICMSSN>0.38</vCredICMSSN>
+            </ICMSSN101>
+          </ICMS>
+          <IPI>
+            <cEnq>999</cEnq>
+            <IPINT>
+              <CST>53</CST>
+            </IPINT>
+          </IPI>
+          <PIS>
+            <PISOutr>
+              <CST>49</CST>
+              <vBC>0.00</vBC>
+              <pPIS>0.0000</pPIS>
+              <vPIS>0.00</vPIS>
+            </PISOutr>
+          </PIS>
+          <COFINS>
+            <COFINSOutr>
+              <CST>49</CST>
+              <vBC>0.00</vBC>
+              <pCOFINS>0.0000</pCOFINS>
+              <vCOFINS>0.00</vCOFINS>
+            </COFINSOutr>
+          </COFINS>
+        </imposto>
+      </det>
+      <total>
+        <ICMSTot>
+          <vBC>0.00</vBC>
+          <vICMS>0.00</vICMS>
+          <vICMSDeson>0.00</vICMSDeson>
+          <vFCPUFDest>0.00</vFCPUFDest>
+          <vICMSUFDest>0.00</vICMSUFDest>
+          <vICMSUFRemet>0.00</vICMSUFRemet>
+          <vFCP>0.00</vFCP>
+          <vBCST>0.00</vBCST>
+          <vST>0.00</vST>
+          <vFCPST>0.00</vFCPST>
+          <vFCPSTRet>0.00</vFCPSTRet>
+          <vProd>14.00</vProd>
+          <vFrete>0.00</vFrete>
+          <vSeg>0.00</vSeg>
+          <vDesc>0.00</vDesc>
+          <vII>0.00</vII>
+          <vIPI>0.00</vIPI>
+          <vIPIDevol>0.00</vIPIDevol>
+          <vPIS>0.00</vPIS>
+          <vCOFINS>0.00</vCOFINS>
+          <vOutro>0.00</vOutro>
+          <vNF>14.00</vNF>
+          <vTotTrib>0.00</vTotTrib>
+        </ICMSTot>
+      </total>
+      <transp>
+        <modFrete>9</modFrete>
+      </transp>
+      <pag>
+        <detPag>
+          <indPag>0</indPag>
+          <tPag>01</tPag>
+          <vPag>14.00</vPag>
+        </detPag>
+        <vTroco>0.00</vTroco>
+      </pag>
+      <infAdic>
+        <infAdFisco>Documento emitido por: Marc Demo</infAdFisco>
+      </infAdic>
+    </infNFe>
+  </NFe>
 </nfeProc>
diff --git a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200681583054000129550010000000012760018057-nf-e.xml b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200681583054000129550010000000012760018057-nf-e.xml
index a10fb1940ab8..c1e8ec0837d7 100644
--- a/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200681583054000129550010000000012760018057-nf-e.xml
+++ b/l10n_br_nfe/tests/nfe/v4_00/leiauteNFe/NFe35200681583054000129550010000000012760018057-nf-e.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <NFe xmlns="http://www.portalfiscal.inf.br/nfe">
   <infNFe versao="4.00" Id="NFe35200681583054000129550010000000012760018057">
     <ide>