From 8de6521e8d854b9e22b73ba183e04a1c0d1ae91f Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Wed, 5 Dec 2018 02:13:35 -0200 Subject: [PATCH] =?UTF-8?q?[FIX]=20Adicionando=20complemento=20de=20endere?= =?UTF-8?q?=C3=A7o=20na=20danfe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pytrustnfe/nfe/danfe.py | 7 +++++-- setup.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pytrustnfe/nfe/danfe.py b/pytrustnfe/nfe/danfe.py index 509c3840..f2735cb3 100644 --- a/pytrustnfe/nfe/danfe.py +++ b/pytrustnfe/nfe/danfe.py @@ -329,6 +329,7 @@ def ide_emit(self, oXML=None, timezone=None): cEnd = tagtext(oNode=elem_emit, cTag='xLgr') + ', ' + tagtext( oNode=elem_emit, cTag='nro') + ' - ' + cEnd += tagtext(oNode=elem_emit, cTag='xCpl') + ' - ' cEnd += tagtext(oNode=elem_emit, cTag='xBairro') + '
' + tagtext( oNode=elem_emit, cTag='xMun') + ' - ' cEnd += 'Fone: ' + tagtext(oNode=elem_emit, cTag='fone') + '
' @@ -416,8 +417,9 @@ def destinatario(self, oXML=None, timezone=None): cDt, cHr = getdateByTimezone( tagtext(oNode=elem_ide, cTag='dhSaiEnt'), timezone) self.string(nMr - 24, self.nlin + 14.3, cDt + ' ' + cHr) # Dt saĆ­da - cEnd = tagtext(oNode=elem_dest, cTag='xLgr') + ', ' + tagtext( - oNode=elem_dest, cTag='nro') + cEnd = '%s, %s %s' % (tagtext(oNode=elem_dest, cTag='xLgr'), + tagtext(oNode=elem_dest, cTag='nro'), + tagtext(oNode=elem_dest, cTag='xCpl')) self.string(self.nLeft + 1, self.nlin + 14.3, cEnd) self.string(nMr - 98, self.nlin + 14.3, tagtext(oNode=elem_dest, cTag='xBairro')) @@ -895,6 +897,7 @@ def recibo_entrega(self, oXML=None, timezone=None): cEnd = tagtext(oNode=el_dest, cTag='xNome') + ' - ' cEnd += tagtext(oNode=el_dest, cTag='xLgr') + ', ' + tagtext( oNode=el_dest, cTag='nro') + ', ' + cEnd += tagtext(oNode=el_dest, cTag='xCpl') + ' ' cEnd += tagtext(oNode=el_dest, cTag='xBairro') + ', ' + tagtext( oNode=el_dest, cTag='xMun') + ' - ' cEnd += tagtext(oNode=el_dest, cTag='UF') diff --git a/setup.py b/setup.py index 83d20ce1..72e449b6 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -VERSION = "1.0.26" +VERSION = "1.0.27" setup(