diff --git a/pytrustnfe/nfe/templates/NfeAutorizacao.xml b/pytrustnfe/nfe/templates/NfeAutorizacao.xml
index cead740..43e1f78 100644
--- a/pytrustnfe/nfe/templates/NfeAutorizacao.xml
+++ b/pytrustnfe/nfe/templates/NfeAutorizacao.xml
@@ -26,7 +26,46 @@
                 <indFinal>{{ ide.indFinal }}</indFinal>
                 <indPres>{{ ide.indPres }}</indPres>
                 <procEmi>{{ ide.procEmi }}</procEmi>
-                <verProc>Odoo Brasil 9.0</verProc>
+                <verProc>Odoo Brasil 10</verProc>
+                {% if ide.NFref is defined -%}
+                {% for ref in ide.NFref %}
+                <NFref>
+                    {% if ref.refNFe is defined -%}
+                    <refNFe>{{ ref.refNFe }}</refNFe>
+                    {% endif %}
+                    {% if ref.refNF is defined -%}
+                    <refNF>
+                        <cUF>{{ ref.refNF.cUF }}</cUF>
+                        <AAMM>{{ ref.refNF.AAMM }}</AAMM>
+                        <CNPJ>{{ ref.refNF.CNPJ }}</CNPJ>
+                        <mod>{{ ref.refNF.mod }}</mod>
+                        <serie>{{ ref.refNF.serie }}</serie>
+                        <nNF>{{ ref.refNF.nNF }}</nNF>
+                    </refNF>
+                    {% endif %}
+                    {% if ref.refNFP is defined -%}
+                    <refNFP>
+                        <cUF>{{ ref.refNFP.cUF }}</cUF>
+                        <AAMM>{{ ref.refNFP.AAMM }}</AAMM>
+                        <CNPJ>{{ ref.refNFP.CNPJ }}</CNPJ>
+                        <CPF>{{ ref.refNFP.CPF }}</CPF>
+                        <IE>{{ ref.refNFP.IE }}</IE>
+                        <mod>{{ ref.refNFP.mod }}</mod>
+                        <serie>{{ ref.refNFP.serie }}</serie>
+                        <nNF>{{ ref.refNFP.nNF }}</nNF>
+                        <refCTe>{{ ref.refNFP.nNF }}</refCTe>
+                    </refNFP>
+                    {% endif %}
+                    {% if ref.refECF is defined -%}
+                    <refECF>
+                        <mod>{{ ref.refECF.mod }}</mod>
+                        <nECF>{{ ref.refECF.nECF }}</nECF>
+                        <nCOO>{{ ref.refECF.nCOO }}</nCOO>
+                    </refECF>
+                    {% endif %}
+                </NFref>
+                {% endfor %}
+                {% endif %}
                 {% endwith %}
             </ide>
             <emit>
@@ -52,6 +91,9 @@
                     <fone>{{ emit.enderEmit.fone }}</fone>
                 </enderEmit>
                 <IE>{{ emit.IE }}</IE>
+                <IEST>{{ emit.IEST }}</IEST>
+                <IM>{{ emit.IM }}</IM>
+                <CNAE>{{ emit.CNAE }}</CNAE>
                 <CRT>{{ emit.CRT }}</CRT>
                 {% endwith %}
             </emit>
@@ -78,8 +120,45 @@
                 </enderDest>
                 <indIEDest>{{ dest.indIEDest }}</indIEDest>
                 {% if dest.IE != '' -%}<IE>{{ dest.IE }}</IE>{% endif %}
+                <ISUF>{{ dest.ISUF }}</ISUF>
+                <IM>{{ dest.IM }}</IM>
+                <email>{{ dest.email }}</email>
                 {% endwith %}
             </dest>
+            {% if NFe.infNFe.retirada is defined %}
+            <retirada>
+                <CNPJ>{{ NFe.infNFe.retirada.CNPJ }}</CNPJ>
+                <CPF>{{ NFe.infNFe.retirada.CPF }}</CPF>
+                <xLgr>{{ NFe.infNFe.retirada.xLgr }}</xLgr>
+                <nro>{{ NFe.infNFe.retirada.nro }}</nro>
+                <xCpl>{{ NFe.infNFe.retirada.xCpl }}</xCpl>
+                <xBairro>{{ NFe.infNFe.retirada.xBairro }}</xBairro>
+                <cMun>{{ NFe.infNFe.retirada.cMun }}</cMun>
+                <xMun>{{ NFe.infNFe.retirada.xMun }}</xMun>
+                <UF>{{ NFe.infNFe.retirada.UF }}</UF>
+            </retirada>
+            {% endif %}
+            {% if NFe.infNFe.entrega is defined %}
+            <entrega>
+                <CNPJ>{{ NFe.infNFe.entrega.CNPJ }}</CNPJ>
+                <CPF>{{ NFe.infNFe.entrega.CPF }}</CPF>
+                <xLgr>{{ NFe.infNFe.entrega.xLgr }}</xLgr>
+                <nro>{{ NFe.infNFe.entrega.nro }}</nro>
+                <xCpl>{{ NFe.infNFe.entrega.xCpl }}</xCpl>
+                <xBairro>{{ NFe.infNFe.entrega.xBairro }}</xBairro>
+                <cMun>{{ NFe.infNFe.entrega.cMun }}</cMun>
+                <xMun>{{ NFe.infNFe.entrega.xMun }}</xMun>
+                <UF>{{ NFe.infNFe.entrega.UF }}</UF>
+            </entrega>
+            {% endif %}
+            {% if NFe.infNFe.autXML %}
+            {% for autorizados in NFe.infNFe.autXML %}
+            <autXML>
+                <CNPJ>{{ autorizados.CNPJ }}</CNPJ>
+                <CPF>{{ autorizados.CPF }}</CPF>
+            </autXML>
+            {% endfor %}
+            {% endif %}
             {% for det in NFe.infNFe.detalhes %}
             <det nItem="1">
                 <prod>
@@ -88,6 +167,8 @@
                     <cEAN>{{ prod.cEAN }}</cEAN>
                     <xProd>{{ prod.xProd }}</xProd>
                     <NCM>{{ prod.NCM }}</NCM>
+                    <NVE>{{ prod.NVE }}</NVE>
+                    <EXTIPI>{{ prod.EXTIPI }}</EXTIPI>
                     <CFOP>{{ prod.CFOP }}</CFOP>
                     <uCom>{{ prod.uCom }}</uCom>
                     <qCom>{{ prod.qCom }}</qCom>
@@ -97,7 +178,58 @@
                     <uTrib>{{ prod.uTrib }}</uTrib>
                     <qTrib>{{ prod.qTrib }}</qTrib>
                     <vUnTrib>{{ prod.vUnTrib }}</vUnTrib>
+                    <vFrete>{{ prod.vFrete }}</vFrete>
+                    <vSeg>{{ prod.vSeg }}</vSeg>
+                    <vDesc>{{ prod.vDesc }}</vDesc>
+                    <vOutro>{{ prod.vOutro }}</vOutro>
                     <indTot>{{ prod.indTot }}</indTot>
+                    {% if prod.DI is defined %}
+                    {% for di in prod.DI %}
+                    <DI>
+                        <nDI>{{ di.nDI }}</nDI>
+                        <dDI>{{ di.dDI }}</dDI>
+                        <xLocDesemb>{{ di.xLocDesemb }}</xLocDesemb>
+                        <UFDesemb>{{ di.UFDesemb }}</UFDesemb>
+                        <dDesemb>{{ di.dDesemb }}</dDesemb>
+                        <tpViaTransp>{{ di.tpViaTransp }}</tpViaTransp>
+                        <vAFRMM>{{ di.vAFRMM }}</vAFRMM>
+                        <tpIntermedio>{{ di.tpIntermedio }}</tpIntermedio>
+                        <CNPJ>{{ di.CNPJ }}</CNPJ>
+                        <UFTerceiro>{{ di.UFTerceiro }}</UFTerceiro>
+                        <cExportador>{{ di.cExportador }}</cExportador>
+                        {% if di.adi is defined %}
+                        {% for adi in di.adi %}
+                        <adi>
+                            <nAdicao>{{ adi.nAdicao }}</nAdicao>
+                            <nSeqAdic>{{ adi.nSeqAdic }}</nSeqAdic>
+                            <cFabricante>{{ adi.cFabricante }}</cFabricante>
+                            <vDescDI>{{ adi.vDescDI }}</vDescDI>
+                            <nDraw>{{ adi.nDraw }}</nDraw>
+                        </adi>
+                        {% endfor %}
+                        {% endif %}
+                    </DI>
+                    {% endfor %}
+                    {% endif %}
+                    {% if prod.detExport is defined %}
+                    {% for export in prod.detExport %}
+                    <detExport>
+                        <nDraw>{{ export.nDraw }}</nDraw>
+                        {% if export.exportInd is defined %}
+                        {% for exp in export.exportInd %}
+                        <exportInd>
+                            <nRE>{{ exp.nRE }}</nRE>
+                            <chNFe>{{ exp.chNFe }}</chNFe>
+                            <qExport>{{ exp.qExport }}</qExport>
+                        </exportInd>
+                        {% endfor %}
+                        {% endif %}
+                    <detExport>
+                    {% endfor %}
+                    {% endif %}
+                    <xPed>{{ prod.xPed }}</xPed>
+                    <nItemPed>{{ prod.nItemPed }}</nItemPed>
+                    <nFCI>{{ prod.nFCI }}</nFCI>
                     {% endwith %}
                 </prod>
                 <imposto>
@@ -114,6 +246,145 @@
                             <vICMS>{{ imposto.ICMS.vICMS }}</vICMS>
                         </ICMS00>
                         {% endif %}
+                        {% if imposto.ICMS.CST == '10' -%}
+                        <ICMS10>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <modBC>{{ imposto.ICMS.modBC }}</modBC>
+                            <vBC>{{ imposto.ICMS.vBC }}</vBC>
+                            <pICMS>{{ imposto.ICMS.pICMS }}</pICMS>
+                            <vICMS>{{ imposto.ICMS.vICMS }}</vICMS>
+                            <modBCST>{{ imposto.ICMS.modBCST }}</modBCST>
+                            <pMVAST>{{ imposto.ICMS.pMVAST }}</pMVAST>
+                            <pRedBCST>{{ imposto.ICMS.pRedBCST }}</pRedBCST>
+                            <vBCST>{{ imposto.ICMS.vBCST }}</vBCST>
+                            <pICMSST>{{ imposto.ICMS.pICMSST }}</pICMSST>
+                            <vICMSST>{{ imposto.ICMS.vICMSST }}</vICMSST>
+                        </ICMS10>
+                        {% endif %}
+                        {% if imposto.ICMS.CST == '20' -%}
+                        <ICMS20>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <modBC>{{ imposto.ICMS.modBC }}</modBC>
+                            <pRedBC>{{ imposto.ICMS.pRedBC }}</pRedBC>
+                            <vBC>{{ imposto.ICMS.vBC }}</vBC>
+                            <pICMS>{{ imposto.ICMS.pICMS }}</pICMS>
+                            <vICMS>{{ imposto.ICMS.vICMS }}</vICMS>
+                            <vICMSDeson>{{ imposto.ICMS.vICMSDeson }}</vICMSDeson>
+                            <motDesICMS>{{ imposto.ICMS.motDesICMS }}</motDesICMS>
+                        </ICMS20>
+                        {% endif %}
+                        {% if imposto.ICMS.CST == '30' -%}
+                        <ICMS30>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <modBCST>{{ imposto.ICMS.modBCST }}</modBCST>
+                            <pMVAST>{{ imposto.ICMS.pMVAST }}</pMVAST>
+                            <pRedBCST>{{ imposto.ICMS.pRedBCST }}</pRedBCST>
+                            <vBCST>{{ imposto.ICMS.vBCST }}</vBCST>
+                            <pICMSST>{{ imposto.ICMS.pICMSST }}</pICMSST>
+                            <vICMSST>{{ imposto.ICMS.vICMSST }}</vICMSST>
+                            <vICMSDeson>{{ imposto.ICMS.vICMSDeson }}</vICMSDeson>
+                            <motDesICMS>{{ imposto.ICMS.motDesICMS }}</motDesICMS>
+                        </ICMS30>
+                        {% endif %}
+                        {% if imposto.ICMS.CST in ('40', '41', '50') -%}
+                        <ICMS40>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <vICMSDeson>{{ imposto.ICMS.vICMSDeson }}</vICMSDeson>
+                            <motDesICMS>{{ imposto.ICMS.motDesICMS }}</motDesICMS>
+                        </ICMS40>
+                        {% endif %}
+                        {% if imposto.ICMS.CST == '51' -%}
+                        <ICMS51>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <modBC>{{ imposto.ICMS.modBC }}</modBC>
+                            <pRedBC>{{ imposto.ICMS.pRedBC }}</pRedBC>
+                            <vBC>{{ imposto.ICMS.vBC }}</vBC>
+                            <pICMS>{{ imposto.ICMS.pICMS }}</pICMS>
+                            <vICMSOp>{{ imposto.ICMS.vICMSOp }}</vICMSOp>
+                            <pDif>{{ imposto.ICMS.pDif }}</pDif>
+                            <vICMSDif>{{ imposto.ICMS.vICMSDif }}</vICMSDif>
+                            <vICMS>{{ imposto.ICMS.vICMS }}</vICMS>
+                        </ICMS51>
+                        {% endif %}
+                        {% if imposto.ICMS.CST == '60' -%}
+                        <ICMS60>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <vBCSTRet>{{ imposto.ICMS.vBCSTRet }}</vBCSTRet>
+                            <vICMSSTRet>{{ imposto.ICMS.vICMSSTRet }}</vICMSSTRet>
+                        </ICMS60>
+                        {% endif %}
+                        {% if imposto.ICMS.CST == '70' -%}
+                        <ICMS70>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <modBC>{{ imposto.ICMS.modBC }}</modBC>
+                            <pRedBC>{{ imposto.ICMS.pRedBC }}</pRedBC>
+                            <vBC>{{ imposto.ICMS.vBC }}</vBC>
+                            <pICMS>{{ imposto.ICMS.pICMS }}</pICMS>
+                            <vICMS>{{ imposto.ICMS.vICMS }}</vICMS>
+                            <modBCST>{{ imposto.ICMS.modBCST }}</modBCST>
+                            <pMVAST>{{ imposto.ICMS.pMVAST }}</pMVAST>
+                            <pRedBCST>{{ imposto.ICMS.pRedBCST }}</pRedBCST>
+                            <vBCST>{{ imposto.ICMS.pICMSST }}</pICvBCSTMSST>
+                            <vICMSST>{{ imposto.ICMS.vICMSST }}</vICMSST>
+                            <vICMSDeson>{{ imposto.ICMS.vICMSDeson }}</vICMSDeson>
+                            <motDesICMS>{{ imposto.ICMS.motDesICMS }}</motDesICMS>
+                        </ICMS70>
+                        {% endif %}
+                        {% if imposto.ICMS.CST == '90' -%}
+                        <ICMS90>
+                            <orig>{{ imposto.ICMS.orig }}</orig>
+                            <CST>{{ imposto.ICMS.CST }}</CST>
+                            <modBC>{{ imposto.ICMS.modBC }}</modBC>
+                            <vBC>{{ imposto.ICMS.vBC }}</vBC>
+                            <pRedBC>{{ imposto.ICMS.pRedBC }}</pRedBC>
+                            <pICMS>{{ imposto.ICMS.pICMS }}</pICMS>
+                            <vICMS>{{ imposto.ICMS.vICMS }}</vICMS>
+                            <modBCST>{{ imposto.ICMS.modBCST }}</modBCST>
+                            <pMVAST>{{ imposto.ICMS.pMVAST }}</pMVAST>
+                            <pRedBCST>{{ imposto.ICMS.pRedBCST }}</pRedBCST>
+                            <vBCST>{{ imposto.ICMS.vBCST }}</vBCST>
+                            <pICMSST>{{ imposto.ICMS.pICMSST }}</pICMSST>
+                            <vICMSST>{{ imposto.ICMS.vICMSST }}</vICMSST>
+                            <vICMSDeson>{{ imposto.ICMS.vICMSDeson }}</vICMSDeson>
+                            <motDesICMS>{{ imposto.ICMS.motDesICMS }}</motDesICMS>
+                        </ICMS90>
+                        {% endif %}
+                        {% if imposto.ICMSPart is defined -%}
+                        <ICMSPart>
+                            <orig>{{ imposto.ICMSPart.orig }}</orig>
+                            <CST>{{ imposto.ICMSPart.CST }}</CST>
+                            <modBC>{{ imposto.ICMSPart.modBC }}</modBC>
+                            <vBC>{{ imposto.ICMSPart.vBC }}</vBC>
+                            <pRedBC>{{ imposto.ICMSPart.pRedBC }}</pRedBC>
+                            <pICMS>{{ imposto.ICMSPart.pICMS }}</pICMS>
+                            <vICMS>{{ imposto.ICMSPart.vICMS }}</vICMS>
+                            <modBCST>{{ imposto.ICMSPart.modBCST }}</modBCST>
+                            <pMVAST>{{ imposto.ICMSPart.pMVAST }}</pMVAST>
+                            <pRedBCST>{{ imposto.ICMSPart.pRedBCST }}</pRedBCST>
+                            <vBCST>{{ imposto.ICMSPart.vBCST }}</vBCST>
+                            <pICMSST>{{ imposto.ICMSPart.pICMSST }}</pICMSST>
+                            <vICMSST>{{ imposto.ICMSPart.vICMSST }}</vICMSST>
+                            <pBCOp>{{ imposto.ICMSPart.pBCOp }}</pBCOp>
+                            <UFST>{{ imposto.ICMSPart.UFST }}</UFST>
+                        </ICMSPart>
+                        {% endif %}
+                        {% if imposto.ICMSST is defined -%}
+                        <ICMSST>
+                            <orig>{{ imposto.ICMSST.orig }}</orig>
+                            <CST>{{ imposto.ICMSST.CST }}</CST>
+                            <vBCSTRet>{{ imposto.ICMSST.vBCSTRet }}</vBCSTRet>
+                            <vICMSSTRet>{{ imposto.ICMSST.vICMSSTRet }}</vICMSSTRet>
+                            <vBCSTDest>{{ imposto.ICMSST.vBCSTDest }}</vBCSTDest>
+                            <vICMSSTDest>{{ imposto.ICMSST.vICMSSTDest }}</vICMSSTDest>
+                        </ICMSST>
+                        {% endif %}
                         {% if imposto.ICMS.CST == '101' -%}
                         <ICMSSN101>
                             <orig>{{ imposto.ICMS.orig }}</orig>
@@ -379,6 +650,19 @@
                     {% endwith %}
                 </ISSQNtot>
                 {% endif %}
+                {% if NFe.infNFe.retTrib is defined %}
+                <retTrib>
+                    {% with retencao = NFe.infNFe.retTrib %}
+                    <vRetPIS>{{ retencao.vRetPIS }}</vRetPIS>
+                    <vRetCOFINS>{{ retencao.vRetCOFINS }}</vRetCOFINS>
+                    <vRetCSLL>{{ retencao.vRetCSLL }}</vRetCSLL>
+                    <vBCIRRF>{{ retencao.vBCIRRF }}</vBCIRRF>
+                    <vIRRF>{{ retencao.vIRRF }}</vIRRF>
+                    <vBCRetPrev>{{ retencao.vBCRetPrev }}</vBCRetPrev>
+                    <vRetPrev>{{ retencao.vRetPrev }}</vRetPrev>
+                    {% endwith %}
+                </retTrib>
+                {% endif %}
             </total>
             <transp>
                 <modFrete>{{ NFe.infNFe.transp.modFrete }}</modFrete>
@@ -441,6 +725,21 @@
                 {% endif %}
             </cobr>
             {% endif %}
+            {% if NFe.infNFe.pag is defined %}
+            {% for pag in NFe.infNFe.pag %}
+            <pag>
+                <tPag>{{ pag.tPag }}</tPag>
+                <vPag>{{ pag.vPag }}</vPag>
+                {% if pag.card is defined %}
+                <card>
+                    <CNPJ>{{ pag.card.CNPJ }}</CNPJ>
+                    <tBand>{{ pag.card.tBand }}</tBand>
+                    <cAut>{{ pag.card.cAut }}</cAut>
+                </card>
+                {% endif %}
+            </pag>
+            {% endfor %}
+            {% endif %}
             <infAdic>
                 <infAdFisco>{{ NFe.infNFe.infAdic.infAdFisco }}</infAdFisco>
                 <infCpl>{{ NFe.infNFe.infAdic.infCpl }}</infCpl>
@@ -461,6 +760,20 @@
                 {% endfor %}
                 {% endif %}
             </infAdic>
+            {% if NFe.infNFe.exporta is defined %}
+            <exporta>
+                <UFSaidaPais>{{ NFe.infNFe.exporta.UFSaidaPais }}</UFSaidaPais>
+                <xLocExporta>{{ NFe.infNFe.exporta.xLocExporta }}</xLocExporta>
+                <xLocDespacho>{{ NFe.infNFe.exporta.xLocDespacho }}</xLocDespacho>
+            </exporta>
+            {% endif %}
+            {% if NFe.infNFe.compra is defined %}
+            <compra>
+                <xNEmp>{{ obs.xNEmp }}</xNEmp>
+                <xPed>{{ obs.xPed }}</xPed>
+                <xCont>{{ obs.xCont }}</xCont>
+            </compra>
+            {% endif %}
         </infNFe>
     </NFe>
     {% endfor %}