From 3fc3d61479cfee78aa7a0888ab967ff7ec3785fa Mon Sep 17 00:00:00 2001
From: Danimar Ribeiro <danimaribeiro@gmail.com>
Date: Wed, 28 Mar 2018 15:02:53 -0300
Subject: [PATCH] =?UTF-8?q?[DONE]=20Finaliza=C3=A7=C3=A3o=20do=20layout=20?=
 =?UTF-8?q?Nota=20Carioca=20-=20Gera=C3=A7=C3=A3o=20e=20Cancelamento?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pytrustnfe/nfse/carioca/__init__.py                      |  9 ++++++---
 pytrustnfe/nfse/carioca/templates/CancelarNfse.xml       | 13 +++++++++++++
 pytrustnfe/nfse/carioca/templates/CancelarNfseEnvio.xml  | 13 -------------
 pytrustnfe/nfse/carioca/templates/ConsultarNfseEnvio.xml |  8 --------
 setup.py                                                 |  2 +-
 5 files changed, 20 insertions(+), 25 deletions(-)
 create mode 100644 pytrustnfe/nfse/carioca/templates/CancelarNfse.xml
 delete mode 100644 pytrustnfe/nfse/carioca/templates/CancelarNfseEnvio.xml
 delete mode 100644 pytrustnfe/nfse/carioca/templates/ConsultarNfseEnvio.xml

diff --git a/pytrustnfe/nfse/carioca/__init__.py b/pytrustnfe/nfse/carioca/__init__.py
index 939c7ab..7a2f885 100644
--- a/pytrustnfe/nfse/carioca/__init__.py
+++ b/pytrustnfe/nfse/carioca/__init__.py
@@ -2,6 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 import os
+import suds
 from pytrustnfe.client import get_authenticated_client
 from pytrustnfe.certificado import extract_cert_and_key_from_pfx, save_cert_key
 from pytrustnfe.xml import render_xml, sanitize_response
@@ -15,6 +16,8 @@ def _render(certificado, method, **kwargs):
     reference = ''
     if method == 'GerarNfse':
         reference = 'r%s' % kwargs['rps']['numero']
+    elif method == 'CancelarNfse':
+        reference = 'Cancelamento_NF%s' % kwargs['cancelamento']['numero_nfse']
 
     signer = Assinatura(certificado.pfx, certificado.password)
     xml_send = signer.assina_xml(xml_send, reference)
@@ -35,7 +38,7 @@ def _send(certificado, method, **kwargs):
     client = get_authenticated_client(base_url, cert, key)
 
     try:
-        response = client.service.GerarNfse(xml_send)
+        response = getattr(client.service, method)(xml_send)
     except suds.WebFault as e:
         return {
             'sent_xml': str(xml_send),
@@ -62,10 +65,10 @@ def gerar_nfse(certificado, **kwargs):
 
 
 def xml_cancelar_nfse(certificado, **kwargs):
-    return _render(certificado, 'CancelarNfseEnvio', **kwargs)
+    return _render(certificado, 'CancelarNfse', **kwargs)
 
 
 def cancelar_nfse(certificado, **kwargs):
     if "xml" not in kwargs:
         kwargs['xml'] = xml_cancelar_nfse(certificado, **kwargs)
-    return _send(certificado, 'CancelarNfseEnvio', **kwargs)
+    return _send(certificado, 'CancelarNfse', **kwargs)
diff --git a/pytrustnfe/nfse/carioca/templates/CancelarNfse.xml b/pytrustnfe/nfse/carioca/templates/CancelarNfse.xml
new file mode 100644
index 0000000..dc6696e
--- /dev/null
+++ b/pytrustnfe/nfse/carioca/templates/CancelarNfse.xml
@@ -0,0 +1,13 @@
+<CancelarNfseEnvio xmlns="http://www.abrasf.org.br/ABRASF/arquivos/nfse.xsd">
+    <Pedido>
+        <InfPedidoCancelamento Id="Cancelamento_NF{{ cancelamento.numero_nfse }}">
+            <IdentificacaoNfse>
+                <Numero>{{ cancelamento.numero_nfse }}</Numero>
+                <Cnpj>{{ cancelamento.cnpj_prestador }}</Cnpj>
+                <InscricaoMunicipal>{{ cancelamento.inscricao_municipal }}</InscricaoMunicipal>
+                <CodigoMunicipio>{{ cancelamento.cidade }}</CodigoMunicipio>
+            </IdentificacaoNfse>
+            <CodigoCancelamento>1</CodigoCancelamento>
+        </InfPedidoCancelamento>
+    </Pedido>
+</CancelarNfseEnvio>
diff --git a/pytrustnfe/nfse/carioca/templates/CancelarNfseEnvio.xml b/pytrustnfe/nfse/carioca/templates/CancelarNfseEnvio.xml
deleted file mode 100644
index 5a1154e..0000000
--- a/pytrustnfe/nfse/carioca/templates/CancelarNfseEnvio.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<CancelarNfseEnvio xmlns="http://www.abrasf.org.br/ABRASF/arquivos/nfse.xsd">
-    <Pedido>
-        <InfPedidoCancelamento Id="NFSe{{ rps.nfse_number }}">
-            <IdentificacaoNfse>
-                <Numero>{{ rps.nfse_number }}</Numero>
-                <Cnpj>{{ rps.emitter.cnpj }}</Cnpj>
-                <InscricaoMunicipal>{{ rps.emitter.city_inscription }}</InscricaoMunicipal>
-                <CodigoMunicipio>{{ rps.service.city_code }}</CodigoMunicipio>
-            </IdentificacaoNfse>
-            <CodigoCancelamento>1</CodigoCancelamento>
-        </InfPedidoCancelamento>
-    </Pedido>
-</CancelarNfseEnvio>
diff --git a/pytrustnfe/nfse/carioca/templates/ConsultarNfseEnvio.xml b/pytrustnfe/nfse/carioca/templates/ConsultarNfseEnvio.xml
deleted file mode 100644
index 1443a0b..0000000
--- a/pytrustnfe/nfse/carioca/templates/ConsultarNfseEnvio.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ConsultarNfseEnvio xmlns="http://www.abrasf.org.br/ABRASF/arquivos/nfse.xsd">
-    <Prestador>
-        <Cnpj>{{ rps.emitter.cnpj }}</Cnpj>
-        <InscricaoMunicipal>{{ rps.emitter.city_inscription }}</InscricaoMunicipal>
-    </Prestador>
-    <NumeroNfse>{{ rps.nfse_number }}</NumeroNfse>
-</ConsultarNfseEnvio>
diff --git a/setup.py b/setup.py
index c5a62ce..c7e626b 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = "0.9.11"
+VERSION = "0.9.12"
 
 
 setup(