From 121831a13959df7af70ef6616c825721f5cee2cf Mon Sep 17 00:00:00 2001
From: El Mau <publico@cuates.net>
Date: Mon, 24 Jan 2022 12:08:17 -0600
Subject: [PATCH] =?UTF-8?q?Quitar=20saltos=20de=20l=C3=ADnea=20en=20XML=20?=
 =?UTF-8?q?de=20cancelaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/app/controllers/utils.py |  2 +-
 source/app/settings.py          | 74 ++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/source/app/controllers/utils.py b/source/app/controllers/utils.py
index f0eec46..72312ef 100644
--- a/source/app/controllers/utils.py
+++ b/source/app/controllers/utils.py
@@ -799,7 +799,7 @@ def cancel_xml_sign(invoice, args, auth, certificado):
     template = TEMPLATE_CANCEL.format(**data)
     tree = ET.fromstring(template.encode())
     sign_xml = cert.sign_xml(tree)
-    print(sign_xml)
+    # ~ print(sign_xml)
 
     result = pac.cancel_xml(sign_xml, auth, invoice.xml)
 
diff --git a/source/app/settings.py b/source/app/settings.py
index 786143f..bc1d03c 100644
--- a/source/app/settings.py
+++ b/source/app/settings.py
@@ -256,41 +256,41 @@ DEFAULT_GLOBAL = {
     'clave_sat': '01010101',
 }
 
-TEMPLATE_CANCEL = """<CancelaCFD xmlns="http://cancelacfd.sat.gob.mx">
-<Cancelacion xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}">
-  <Folios>
-    <Folio UUID="{uuid}" Motivo="{motivo}"{folio}/>
-  </Folios>
-  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-    <SignedInfo>
-      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
-      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-      <Reference URI="">
-        <Transforms>
-          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-        </Transforms>
-        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <DigestValue/>
-      </Reference>
-    </SignedInfo>
-    <SignatureValue/>
-    <KeyInfo>
-      <X509Data>
-        <X509IssuerSerial>
-          <X509IssuerName/>
-          <X509SerialNumber/>
-        </X509IssuerSerial>
-        <X509Certificate/>
-      </X509Data>
-      <KeyValue>
-        <RSAKeyValue>
-          <Modulus/>
-          <Exponent/>
-        </RSAKeyValue>
-      </KeyValue>
-    </KeyInfo>
-  </Signature>
-</Cancelacion>
-</CancelaCFD>"""
+# ~ TEMPLATE_CANCEL = """<CancelaCFD xmlns="http://cancelacfd.sat.gob.mx">
+# ~ <Cancelacion xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}">
+  # ~ <Folios>
+    # ~ <Folio UUID="{uuid}" Motivo="{motivo}"{folio}/>
+  # ~ </Folios>
+  # ~ <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    # ~ <SignedInfo>
+      # ~ <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      # ~ <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+      # ~ <Reference URI="">
+        # ~ <Transforms>
+          # ~ <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+        # ~ </Transforms>
+        # ~ <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        # ~ <DigestValue/>
+      # ~ </Reference>
+    # ~ </SignedInfo>
+    # ~ <SignatureValue/>
+    # ~ <KeyInfo>
+      # ~ <X509Data>
+        # ~ <X509IssuerSerial>
+          # ~ <X509IssuerName/>
+          # ~ <X509SerialNumber/>
+        # ~ </X509IssuerSerial>
+        # ~ <X509Certificate/>
+      # ~ </X509Data>
+      # ~ <KeyValue>
+        # ~ <RSAKeyValue>
+          # ~ <Modulus/>
+          # ~ <Exponent/>
+        # ~ </RSAKeyValue>
+      # ~ </KeyValue>
+    # ~ </KeyInfo>
+  # ~ </Signature>
+# ~ </Cancelacion>
+# ~ </CancelaCFD>"""
 
-# ~ TEMPLATE_CANCEL = """<Cancelacion xmlns="http://cancelacfd.sat.gob.mx" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion>"""
+TEMPLATE_CANCEL = """<CancelaCFD xmlns="http://cancelacfd.sat.gob.mx"><Cancelacion xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion></CancelaCFD>"""