From b4aa3553f30dbd6b8f74b66fed020eee276659bf Mon Sep 17 00:00:00 2001 From: Felipe Prenholato Date: Fri, 13 Apr 2018 19:41:32 -0300 Subject: [PATCH 1/7] Better template --- .../nfse/paulistana/templates/EnvioLoteRPS.xml | 53 ++++++++++++++-------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml index 8e9f34d..a662c8e 100644 --- a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml +++ b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml @@ -1,16 +1,4 @@ - - - {{ nfse.cpf_cnpj }} - - false - {{ nfse.data_inicio }} - {{ nfse.data_fim }} - 1 - {{ nfse.total_servicos }} - {{ nfse.total_deducoes }} - - {% for rps in nfse.lista_rps -%} {{ rps.assinatura }} @@ -32,29 +20,56 @@ {{ rps.codigo_atividade }} {{ rps.aliquota_atividade }} {{ rps.iss_retido | default('false') }} + {% if rps.tomador.tipo_cpfcnpj != 3 %} - {% if rps.tomador.tipo_cpfcnpj == 1 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} - {% if rps.tomador.tipo_cpfcnpj == 2 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 1 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 2 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} + {% endif %} {% if rps.tomador.inscricao_municipal -%} {{ rps.tomador.inscricao_municipal }} {% endif %} {{ rps.tomador.razao_social|normalize|escape }} + {% if rps.tomador.cidade %} + {% if rps.tomador.tipo_logradouro %} {{ rps.tomador.tipo_logradouro }} + {% endif %} + {% if rps.tomador.logradouro %} {{ rps.tomador.logradouro|normalize|escape }} + {% endif %} + {% if rps.tomador.numero %} {{ rps.tomador.numero }} + {% endif %} + {% if rps.tomador.complemento %} {{ rps.tomador.complemento|normalize|escape }} + {% endif %} + {% if rps.tomador.bairro %} {{ rps.tomador.bairro }} + {% endif %} {{ rps.tomador.cidade }} {{ rps.tomador.uf }} - {{ rps.tomador.cep }} + {% if rps.tomador.cep %}{{ rps.tomador.cep }}{% endif %} + {% endif %} + {% if rps.tomador.email %}{{ rps.tomador.email }}{% endif %} {{ rps.descricao|normalize|escape }} + {% for rps in nfse.lista_rps -%} + + + {{ nfse.cpf_cnpj }} + + false + {{ nfse.data_inicio }} + {{ nfse.data_fim }} + 1 + {{ nfse.total_servicos }} + {{ nfse.total_deducoes }} + {% endfor %} From 074b8e27a819145103cbd43a15f0b952e3eabb6d Mon Sep 17 00:00:00 2001 From: Felipe Prenholato Date: Sun, 15 Apr 2018 22:12:29 -0300 Subject: [PATCH 2/7] WIP: trying to make versioning works. Use postN versioning so we don't conflict with any original version. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index d862966..d3ff23c 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,10 @@ # coding=utf-8 from setuptools import setup, find_packages -VERSION = "0.1.45" +VERSION = "0.1.45.post1" setup( - name="PyTrustNFe", + name="PyTrustNFeLoggi", version=VERSION, author="Danimar Ribeiro", author_email='danimaribeiro@gmail.com', From dc32b676912b6763e29f659c978170fc21a7b264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roge=CC=81rio=20Sampaio=20de=20Almeida?= Date: Wed, 25 Apr 2018 21:22:31 -0300 Subject: [PATCH 3/7] fix(*) setup name cannot use upper case to install in an internal pypi --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d3ff23c..18a5e7a 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages VERSION = "0.1.45.post1" setup( - name="PyTrustNFeLoggi", + name="pytrustnfe", version=VERSION, author="Danimar Ribeiro", author_email='danimaribeiro@gmail.com', From d2dde129a773d3b1419da50c4fe824272bebbcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roge=CC=81rio=20Sampaio=20de=20Almeida?= Date: Wed, 25 Apr 2018 22:03:48 -0300 Subject: [PATCH 4/7] chore(*) gitignore .idea --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f171cd6..8763895 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ dist/ docs/_build .vscode/tags .cache/ +.idea From ff990bb5776638302eda99884913dcd630fd1c4a Mon Sep 17 00:00:00 2001 From: Felipe Prenholato Date: Thu, 26 Apr 2018 14:30:08 -0300 Subject: [PATCH 5/7] Revert "Better template" This reverts commit b4aa3553f30dbd6b8f74b66fed020eee276659bf. --- .../nfse/paulistana/templates/EnvioLoteRPS.xml | 53 ++++++++-------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml index a662c8e..8e9f34d 100644 --- a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml +++ b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml @@ -1,4 +1,16 @@ + + + {{ nfse.cpf_cnpj }} + + false + {{ nfse.data_inicio }} + {{ nfse.data_fim }} + 1 + {{ nfse.total_servicos }} + {{ nfse.total_deducoes }} + + {% for rps in nfse.lista_rps -%} {{ rps.assinatura }} @@ -20,56 +32,29 @@ {{ rps.codigo_atividade }} {{ rps.aliquota_atividade }} {{ rps.iss_retido | default('false') }} - {% if rps.tomador.tipo_cpfcnpj != 3 %} - {% if rps.tomador.tipo_cpfcnpj == 1 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} - {% if rps.tomador.tipo_cpfcnpj == 2 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 1 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 2 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} - {% endif %} {% if rps.tomador.inscricao_municipal -%} {{ rps.tomador.inscricao_municipal }} {% endif %} {{ rps.tomador.razao_social|normalize|escape }} - {% if rps.tomador.cidade %} - {% if rps.tomador.tipo_logradouro %} {{ rps.tomador.tipo_logradouro }} - {% endif %} - {% if rps.tomador.logradouro %} {{ rps.tomador.logradouro|normalize|escape }} - {% endif %} - {% if rps.tomador.numero %} {{ rps.tomador.numero }} - {% endif %} - {% if rps.tomador.complemento %} {{ rps.tomador.complemento|normalize|escape }} - {% endif %} - {% if rps.tomador.bairro %} {{ rps.tomador.bairro }} - {% endif %} {{ rps.tomador.cidade }} {{ rps.tomador.uf }} - {% if rps.tomador.cep %}{{ rps.tomador.cep }}{% endif %} + {{ rps.tomador.cep }} - {% endif %} - {% if rps.tomador.email %}{{ rps.tomador.email }}{% endif %} {{ rps.descricao|normalize|escape }} - {% for rps in nfse.lista_rps -%} - - - {{ nfse.cpf_cnpj }} - - false - {{ nfse.data_inicio }} - {{ nfse.data_fim }} - 1 - {{ nfse.total_servicos }} - {{ nfse.total_deducoes }} - {% endfor %} From 9d77619a7353f4ffb6c7dcc48a2831a01374615b Mon Sep 17 00:00:00 2001 From: Felipe Prenholato Date: Thu, 26 Apr 2018 14:57:30 -0300 Subject: [PATCH 6/7] Better templates, for real. --- .../nfse/paulistana/templates/EnvioLoteRPS.xml | 29 ++++++-- pytrustnfe/nfse/paulistana/templates/EnvioRPS.xml | 80 +++++++++++++--------- 2 files changed, 71 insertions(+), 38 deletions(-) diff --git a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml index 8e9f34d..e7003de 100644 --- a/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml +++ b/pytrustnfe/nfse/paulistana/templates/EnvioLoteRPS.xml @@ -32,28 +32,43 @@ {{ rps.codigo_atividade }} {{ rps.aliquota_atividade }} {{ rps.iss_retido | default('false') }} + {% if rps.tomador.tipo_cpfcnpj != 3 %} - {% if rps.tomador.tipo_cpfcnpj == 1 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} - {% if rps.tomador.tipo_cpfcnpj == 2 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 1 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 2 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} + {% endif %} {% if rps.tomador.inscricao_municipal -%} {{ rps.tomador.inscricao_municipal }} {% endif %} {{ rps.tomador.razao_social|normalize|escape }} + {% if rps.tomador.cidade %} + {% if rps.tomador.tipo_logradouro %} {{ rps.tomador.tipo_logradouro }} + {% endif %} + {% if rps.tomador.logradouro %} {{ rps.tomador.logradouro|normalize|escape }} + {% endif %} + {% if rps.tomador.numero %} {{ rps.tomador.numero }} + {% endif %} + {% if rps.tomador.complemento %} {{ rps.tomador.complemento|normalize|escape }} + {% endif %} + {% if rps.tomador.bairro %} {{ rps.tomador.bairro }} + {% endif %} {{ rps.tomador.cidade }} {{ rps.tomador.uf }} - {{ rps.tomador.cep }} + {% if rps.tomador.cep %}{{ rps.tomador.cep }}{% endif %} + {% endif %} + {% if rps.tomador.email %}{{ rps.tomador.email }}{% endif %} {{ rps.descricao|normalize|escape }} {% endfor %} diff --git a/pytrustnfe/nfse/paulistana/templates/EnvioRPS.xml b/pytrustnfe/nfse/paulistana/templates/EnvioRPS.xml index d828534..35e08cb 100644 --- a/pytrustnfe/nfse/paulistana/templates/EnvioRPS.xml +++ b/pytrustnfe/nfse/paulistana/templates/EnvioRPS.xml @@ -6,46 +6,64 @@ {% for rps in nfse.lista_rps -%} - {{ rps.assinatura }} + {{ rps.assinatura }} - {{ rps.prestador.inscricao_municipal }} - {{ rps.serie }} - {{ rps.numero }} + {{ rps.prestador.inscricao_municipal }} + {{ rps.serie }} + {{ rps.numero }} - RPS-M + {{ rps.tipo_rps | default('RPS') }} {{ rps.data_emissao }} N - T - {{ nfse.total_servicos }} - {{ nfse.total_deducoes }} - {{ rps.valor_pis }} - {{ rps.valor_cofins }} - {{ rps.valor_inss }} - {{ rps.valor_pis }} - {{ rps.valor_csll }} + {{ rps.tributacao_rps | default('T') }} + {{ rps.valor_servico }} + {{ rps.valor_deducao }} + {{ rps.valor_pis | default('0.00') }} + {{ rps.valor_cofins | default('0.00') }} + {{ rps.valor_inss | default('0.00') }} + {{ rps.valor_ir | default('0.00') }} + {{ rps.valor_csll | default('0.00') }} {{ rps.codigo_atividade }} {{ rps.aliquota_atividade }} - false + {{ rps.iss_retido | default('false') }} + {% if rps.tomador.tipo_cpfcnpj != 3 %} - {% if rps.tomador.tipo_cpfcnpj == 1 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} - {% if rps.tomador.tipo_cpfcnpj == 2 -%} - {{ rps.tomador.cpf_cnpj }} - {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 1 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} + {% if rps.tomador.tipo_cpfcnpj == 2 -%} + {{ rps.tomador.cpf_cnpj }} + {% endif %} - {{ rps.tomador.razao_social }} + {% endif %} + {% if rps.tomador.inscricao_municipal -%} + {{ rps.tomador.inscricao_municipal }} + {% endif %} + {{ rps.tomador.razao_social|normalize|escape }} + {% if rps.tomador.cidade %} - {{ rps.tomador.tipo_logradouro }} - {{ rps.tomador.logradouro }} - {{ rps.tomador.numero }} - {{ rps.tomador.complemento }} - {{ rps.tomador.bairro }} - {{ rps.tomador.cidade }} - {{ rps.tomador.uf }} - {{ rps.tomador.cep }} + {% if rps.tomador.tipo_logradouro %} + {{ rps.tomador.tipo_logradouro }} + {% endif %} + {% if rps.tomador.logradouro %} + {{ rps.tomador.logradouro|normalize|escape }} + {% endif %} + {% if rps.tomador.numero %} + {{ rps.tomador.numero }} + {% endif %} + {% if rps.tomador.complemento %} + {{ rps.tomador.complemento|normalize|escape }} + {% endif %} + {% if rps.tomador.bairro %} + {{ rps.tomador.bairro }} + {% endif %} + {{ rps.tomador.cidade }} + {{ rps.tomador.uf }} + {% if rps.tomador.cep %}{{ rps.tomador.cep }}{% endif %} - {{ rps.descricao }} - {% endfor %} + {% endif %} + {% if rps.tomador.email %}{{ rps.tomador.email }}{% endif %} + {{ rps.descricao|normalize|escape }} + {% endfor %} From 02716db168df58500d77b2b323bffa0965cc4742 Mon Sep 17 00:00:00 2001 From: Felipe Prenholato Date: Wed, 2 May 2018 14:02:48 -0300 Subject: [PATCH 7/7] Bump to v0.1.45.post3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 18a5e7a..cdddd0c 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # coding=utf-8 from setuptools import setup, find_packages -VERSION = "0.1.45.post1" +VERSION = "0.1.45.post3" setup( name="pytrustnfe",