diff --git a/pytrustnfe/nfe/danfe.py b/pytrustnfe/nfe/danfe.py index f3b33ee..9cc0917 100644 --- a/pytrustnfe/nfe/danfe.py +++ b/pytrustnfe/nfe/danfe.py @@ -600,27 +600,28 @@ obsCont[@xCampo='NomeVendedor']") self.hline(self.nLeft, self.nlin + 8.6, self.width - self.nLeft) self.hline(self.nLeft, self.nlin + 15.2, self.width - self.nLeft) self.vline(nMr - 26, self.nlin + 2, 13.2) - self.vline(nMr - 45, self.nlin + 2, 20) - self.vline(nMr - 78, self.nlin + 2, 6.6) - self.vline(nMr - 134, self.nlin + 2, 6.6) - self.vline(nMr - 64, self.nlin + 2, 6.6) + self.vline(nMr - 33, self.nlin + 2, 13.2) + self.vline(nMr - 67, self.nlin + 2, 6.6) + self.vline(nMr - 123, self.nlin + 2, 6.6) + self.vline(nMr - 53, self.nlin + 2, 6.6) self.vline(nMr - 26, self.nlin + 15.2, 6.6) + self.vline(nMr - 49, self.nlin + 15.2, 6.6) self.vline(nMr - 102, self.nlin + 8.6, 6.6) self.vline(nMr - 85, self.nlin + 15.2, 6.6) self.vline(nMr - 121, self.nlin + 15.2, 6.6) self.vline(nMr - 160, self.nlin + 15.2, 6.6) # Labels/Fields self.string(nMr - 25, self.nlin + 3.8, 'CNPJ/CPF') - self.string(nMr - 63, self.nlin + 3.8, 'PLACA DO VEÍCULO') - self.string(nMr - 77, self.nlin + 3.8, 'CÓDIGO ANTT') - self.string(nMr - 133, self.nlin + 3.8, 'FRETE POR CONTA') + self.string(nMr - 52, self.nlin + 3.8, 'PLACA DO VEÍCULO') + self.string(nMr - 66, self.nlin + 3.8, 'CÓDIGO ANTT') + self.string(nMr - 122, self.nlin + 3.8, 'FRETE POR CONTA') self.string(self.nLeft + 1, self.nlin + 3.8, 'RAZÃO SOCIAL') - self.string(nMr - 44, self.nlin + 3.8, 'UF') + self.string(nMr - 32, self.nlin + 3.8, 'UF') self.string(nMr - 25, self.nlin + 10.3, 'INSCRIÇÃO ESTADUAL') - self.string(nMr - 44, self.nlin + 10.3, 'UF') + self.string(nMr - 32, self.nlin + 10.3, 'UF') self.string(nMr - 101, self.nlin + 10.3, 'MUNICÍPIO') self.string(self.nLeft + 1, self.nlin + 10.3, 'ENDEREÇO') - self.string(nMr - 44, self.nlin + 17, 'PESO BRUTO') + self.string(nMr - 48, self.nlin + 17, 'PESO BRUTO') self.string(nMr - 25, self.nlin + 17, 'PESO LÍQUIDO') self.string(nMr - 84, self.nlin + 17, 'NUMERAÇÃO') self.string(nMr - 120, self.nlin + 17, 'MARCA') @@ -629,14 +630,14 @@ obsCont[@xCampo='NomeVendedor']") # Conteúdo campos self.canvas.setFont('NimbusSanL-Regu', 7) self.string(self.nLeft + 1, self.nlin + 7.7, - tagtext(oNode=el_transp, cTag='xNome')[:35]) - self.string(self.nLeft + 57, self.nlin + 7.7, + tagtext(oNode=el_transp, cTag='xNome')[:42]) + self.string(self.nLeft + 68, self.nlin + 7.7, self.oFrete[tagtext(oNode=el_transp, cTag='modFrete')]) - self.string(self.nLeft + 113, self.nlin + 7.7, + self.string(self.nLeft + 122, self.nlin + 7.7, tagtext(oNode=el_transp, cTag='RNTC')) - self.string(self.nLeft + 127, self.nlin + 7.7, + self.string(self.nLeft + 136, self.nlin + 7.7, tagtext(oNode=el_transp, cTag='placa')) - self.string(self.nLeft + 146, self.nlin + 7.7, + self.string(self.nLeft + 157, self.nlin + 7.7, tagtext(oNode=veic_transp, cTag='UF')) self.string(nMr - 25, self.nlin + 7.7, format_cnpj_cpf(tagtext(oNode=el_transp, cTag='CNPJ'))) @@ -645,7 +646,7 @@ obsCont[@xCampo='NomeVendedor']") tagtext(oNode=el_transp, cTag='xEnder')[:45]) self.string(self.nLeft + 89, self.nlin + 14.2, tagtext(oNode=el_transp, cTag='xMun')) - self.string(nMr - 44, self.nlin + 14.2, + self.string(nMr - 32, self.nlin + 14.2, tagtext(oNode=el_transp, cTag='UF')) self.string(nMr - 25, self.nlin + 14.2, tagtext(oNode=el_transp, cTag='IE'))