From 325bb782346794dc267e92548b70fa1ab90349d1 Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Thu, 8 Oct 2020 01:02:21 -0300 Subject: [PATCH 1/3] New urls for nfce RS --- pytrustnfe/Servidores.py | 28 ++++++++++++++-------------- setup.py | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pytrustnfe/Servidores.py b/pytrustnfe/Servidores.py index c5432a8..0781208 100644 --- a/pytrustnfe/Servidores.py +++ b/pytrustnfe/Servidores.py @@ -619,24 +619,24 @@ UFRS = { NFCE_MODELO: { AMBIENTE_PRODUCAO: { "servidor": "nfce.sefazrs.rs.gov.br", - WS_NFE_RECEPCAO_EVENTO: "ws/recepcaoevento/recepcaoevento.asmx", - WS_NFE_AUTORIZACAO: "ws/NfeAutorizacao/NFeAutorizacao.asmx", - WS_NFE_RET_AUTORIZACAO: "ws/NfeRetAutorizacao/NFeRetAutorizacao.asmx", # noqa - WS_NFE_CADASTRO: "ws/cadconsultacadastro/cadconsultacadastro2.asmx", # noqa - WS_NFE_INUTILIZACAO: "ws/NfeInutilizacao/NfeInutilizacao2.asmx", - WS_NFE_CONSULTA: "ws/NfeConsulta/NfeConsulta2.asmx", - WS_NFE_SITUACAO: "ws/NfeStatusServico/NfeStatusServico2.asmx", + WS_NFE_RECEPCAO_EVENTO: "ws/recepcaoevento/recepcaoevento4.asmx?wsdl", + WS_NFE_AUTORIZACAO: "ws/NfeAutorizacao/NFeAutorizacao4.asmx?wsdl", + WS_NFE_RET_AUTORIZACAO: "ws/NfeRetAutorizacao/NFeRetAutorizacao4.asmx?wsdl", # noqa + WS_NFE_CADASTRO: "ws/cadconsultacadastro/cadconsultacadastro2.asmx?wsdl", # noqa + WS_NFE_INUTILIZACAO: "ws/nfeinutilizacao/nfeinutilizacao4.asmx?wsdl", + WS_NFE_CONSULTA: "ws/NfeConsulta/NfeConsulta4.asmx?wsdl", + WS_NFE_SITUACAO: "ws/NfeStatusServico/NfeStatusServico4.asmx?wsdl", WS_NFCE_QR_CODE: "https://www.sefaz.rs.gov.br/NFCE/NFCE-COM.aspx", }, AMBIENTE_HOMOLOGACAO: { "servidor": "nfce-homologacao.sefazrs.rs.gov.br", - WS_NFE_RECEPCAO_EVENTO: "ws/recepcaoevento/recepcaoevento.asmx", - WS_NFE_AUTORIZACAO: "ws/NfeAutorizacao/NFeAutorizacao.asmx", - WS_NFE_RET_AUTORIZACAO: "ws/NfeRetAutorizacao/NFeRetAutorizacao.asmx", # noqa - WS_NFE_CADASTRO: "ws/cadconsultacadastro/cadconsultacadastro2.asmx", # noqa - WS_NFE_INUTILIZACAO: "ws/NfeInutilizacao/NfeInutilizacao2.asmx", - WS_NFE_CONSULTA: "ws/NfeConsulta/NfeConsulta2.asmx", - WS_NFE_SITUACAO: "ws/NfeStatusServico/NfeStatusServico2.asmx", + WS_NFE_RECEPCAO_EVENTO: "ws/recepcaoevento/recepcaoevento4.asmx?wsdl", + WS_NFE_AUTORIZACAO: "ws/NfeAutorizacao/NFeAutorizacao4.asmx?wsdl", + WS_NFE_RET_AUTORIZACAO: "ws/NfeRetAutorizacao/NFeRetAutorizacao4.asmx?wsdl", # noqa + WS_NFE_CADASTRO: "ws/cadconsultacadastro/cadconsultacadastro2.asmx?wsdl", # noqa + WS_NFE_INUTILIZACAO: "ws/NfeInutilizacao/NfeInutilizacao4.asmx?wsdl", + WS_NFE_CONSULTA: "ws/NfeConsulta/NfeConsulta4.asmx?wsdl", + WS_NFE_SITUACAO: "ws/NfeStatusServico/NfeStatusServico4.asmx?wsdl", WS_NFCE_QR_CODE: "https://www.sefaz.rs.gov.br/NFCE/NFCE-COM.aspx", }, }, diff --git a/setup.py b/setup.py index 96cc4c1..52e7c21 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -VERSION = "1.0.53" +VERSION = "1.0.54" setup( From 7729c1df50ccfc13e311ec58af535e56fa84bec9 Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Fri, 30 Oct 2020 17:20:37 -0300 Subject: [PATCH 2/3] Carga tributaria media como opcional --- pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml | 2 ++ setup.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml index bf5e52f..be852fb 100644 --- a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml +++ b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml @@ -70,8 +70,10 @@ {% endif %} {% if rps.tomador.email %}{{ rps.tomador.email }}{% endif %} {{ rps.descricao|normalize|escape }} + {% if rps.valor_carga_tributarial %} {{ rps.valor_carga_tributaria }} {{ rps.fonte_carga_tributaria }} + {% endif %} {% endfor %} diff --git a/setup.py b/setup.py index 52e7c21..07316f9 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -VERSION = "1.0.54" +VERSION = "1.0.55" setup( From c5b4d9e4e83647b09c10e658001537d61c6a244b Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Fri, 30 Oct 2020 22:56:13 -0300 Subject: [PATCH 3/3] Fix unit tests --- tests/XMLs/paulistana_signature.xml | 10 +++++----- tests/XMLs/xml_send_rps_batch_to_paulistana.xml | 2 +- tests/test_nfse_paulistana.py | 3 +++ tests/test_nfse_paulistana_para_lote.py | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/XMLs/paulistana_signature.xml b/tests/XMLs/paulistana_signature.xml index 644d7a8..f9a0af4 100644 --- a/tests/XMLs/paulistana_signature.xml +++ b/tests/XMLs/paulistana_signature.xml @@ -1,4 +1,4 @@ -12345678901234false2016-08-292016-08-291E4fpHYkQa7Naxn6IKGb7NwwZu5tPk/KXJ9hCwtZgq0xvKS450aQqqBL+7Iv46lTgqrSMu7+gLrl+LC1qs/8aT2mbHE8uaVFSbzwZ+sF/BkcT6nsFHLMswEiTAEs95Jb7hN1cC91xqQGRH4buw0TzxHKmhuLJ22WwtG/scxyKtjM=12345611RPS2016-08-29NT0.000.000.000.000.00074985.00false123456Trustcode1Vinicius de Moraes, 4242CorregoFloripaSC88037240Venda de servico +12345678901234false2016-08-292016-08-291E4fpHYkQa7Naxn6IKGb7NwwZu5tPk/KXJ9hCwtZgq0xvKS450aQqqBL+7Iv46lTgqrSMu7+gLrl+LC1qs/8aT2mbHE8uaVFSbzwZ+sF/BkcT6nsFHLMswEiTAEs95Jb7hN1cC91xqQGRH4buw0TzxHKmhuLJ22WwtG/scxyKtjM=12345611RPS2016-08-29NT0.000.000.000.000.00074985.00false123456Trustcode1Vinicius de Moraes, 4242CorregoFloripaSC88037240Venda de servico @@ -8,12 +8,12 @@ -Thwvs++WdhRuXOVgMxXTY/9Zih0= +hhkZS9mMYMESJbiswtX0rTq7620= -fvJR0msutiLI9KpUY/8VDPqmDeGYpXt/JvY6LUQZlGjjGb71jM2cLEHotM4lwJLi -WKLvhSBbaLQQm/OFm1KbQ8TRrEJl8NMYv2bABNoH9OxIn5Ecnb4jxCCAaIDN3iXy -B7oYCq5nqtfsFGplU29enQ//1SrRTE4MDsOwoN8bX0c= +Rh6jw1huU4fgTdm8wclRBOaewnccPgOwuT0lya7Z55Ay/GlcXDO/vRRDCgvezhGT +5HkRfXP92gjPgkSnNC23zZMBbTnWzg8Jm8YxDUmwRJujH5RMFBLmNjBIOwfI2o/4 +LhSCoPTBBJ/1JO1nJDABKPFcejWuDeLhIIBj9QqcyW0= MIICMTCCAZqgAwIBAgIQfYOsIEVuAJ1FwwcTrY0t1DANBgkqhkiG9w0BAQUFADBX diff --git a/tests/XMLs/xml_send_rps_batch_to_paulistana.xml b/tests/XMLs/xml_send_rps_batch_to_paulistana.xml index 2eebb3b..63a3c1f 100644 --- a/tests/XMLs/xml_send_rps_batch_to_paulistana.xml +++ b/tests/XMLs/xml_send_rps_batch_to_paulistana.xml @@ -1 +1 @@ -12345678901234false2016-08-292016-08-29512312345610RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345611RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345612RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345613RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345614RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico \ No newline at end of file +12345678901234false2016-08-292016-08-29512312345610RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345611RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345612RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345613RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico12312345614RPS2016-08-29NT0.000.000.000.000.00074985.00false12345678923256123456Trustcode1Vinicius de Moraes, 4242aaaCorregoFloripaSC88037240user@user.comVenda de servico \ No newline at end of file diff --git a/tests/test_nfse_paulistana.py b/tests/test_nfse_paulistana.py index 75f4fea..ea91472 100644 --- a/tests/test_nfse_paulistana.py +++ b/tests/test_nfse_paulistana.py @@ -87,6 +87,9 @@ class test_nfse_paulistana(unittest.TestCase): retorno.service.EnvioLoteRPS.return_value = "" retorno = envio_lote_rps(pfx, nfse=nfse) + # f = open(os.path.join(path, "paulistana_signature.xml"), "w") + # f.write(retorno["sent_xml"]) + # f.close() self.assertEqual(retorno["sent_xml"], xml_sent) def _get_cancelamento(self): diff --git a/tests/test_nfse_paulistana_para_lote.py b/tests/test_nfse_paulistana_para_lote.py index 2612992..73ea7c6 100644 --- a/tests/test_nfse_paulistana_para_lote.py +++ b/tests/test_nfse_paulistana_para_lote.py @@ -26,4 +26,7 @@ class test_nfse_paulistana_para_lote(unittest.TestCase): _, obj = sanitize_response(xml_send) self.assertEqual(obj.Cabecalho.QtdRPS, self.BATCH_SIZE) + # f = open(os.path.join(self.xml_path, 'xml_send_rps_batch_to_paulistana.xml'), 'w') + # f.write(xml_send) + # f.close() self.assertEqual(xml_send, expected_xml)