Corregir el error al enviar correo

This commit is contained in:
El Mau 2022-01-20 17:02:11 -06:00
parent 88dd9ca04b
commit e40acd28ba
4 changed files with 26 additions and 23 deletions

View File

@ -1,7 +1,7 @@
v 1.45.1 [20-Ene-2022] v 1.45.1 [20-Ene-2022]
---------------------- ----------------------
- Error: Al enviar correos con la nueva configuración - Error: Al enviar correos con la nueva configuración
- Error: Al cancelar CFDI
* IMPORTANTE: Revisa tu configuración de correo para verificar que todo funcione. * IMPORTANTE: Revisa tu configuración de correo para verificar que todo funcione.

View File

@ -24,7 +24,8 @@ import lxml.etree as ET
import requests import requests
from requests.exceptions import ConnectionError from requests.exceptions import ConnectionError
from .conf import DEBUG, AUTH from .conf import DEBUG
# ~ , AUTH
LOG_FORMAT = '%(asctime)s - %(levelname)s - %(message)s' LOG_FORMAT = '%(asctime)s - %(levelname)s - %(message)s'
@ -107,9 +108,9 @@ class PACComercioDigital(object):
pretty_print=True, doctype='<?xml version="1.0" encoding="utf-8"?>') pretty_print=True, doctype='<?xml version="1.0" encoding="utf-8"?>')
return xml return xml
def stamp(self, cfdi, auth={}): def stamp(self, cfdi, auth):
if DEBUG or not auth: # ~ if DEBUG or not auth:
auth = AUTH # ~ auth = AUTH
url = self.URL['timbra'] url = self.URL['timbra']
headers = { headers = {
@ -147,7 +148,7 @@ class PACComercioDigital(object):
return data return data
def _get_data_cancel(self, cfdi, info, auth): def _get_data_cancel(self, cfdi, info, auth):
info['pass'] = '12345678a' info['pass'] = ''
info['tipo'] = 'cfdi' info['tipo'] = 'cfdi'
info['key'] = base64.b64encode(info['key']).decode() info['key'] = base64.b64encode(info['key']).decode()
info['cer'] = base64.b64encode(info['cer']).decode() info['cer'] = base64.b64encode(info['cer']).decode()
@ -190,9 +191,9 @@ class PACComercioDigital(object):
) )
return '\n'.join(data) return '\n'.join(data)
def cancel(self, cfdi, info, auth={}): def cancel(self, cfdi, info, auth):
if DEBUG or not auth: # ~ if DEBUG or not auth:
auth = AUTH # ~ auth = AUTH
url = self.URL['cancel'] url = self.URL['cancel']
data = self._get_data_cancel(cfdi, info, auth) data = self._get_data_cancel(cfdi, info, auth)
@ -245,9 +246,9 @@ class PACComercioDigital(object):
return headers return headers
def cancel_xml(self, xml, auth={}, cfdi='', info={'tipo': 'cfdi'}): def cancel_xml(self, xml, auth, cfdi='', info={'tipo': 'cfdi'}):
if DEBUG or not auth: # ~ if DEBUG or not auth:
auth = AUTH # ~ auth = AUTH
url = self.URL['cancelxml'] url = self.URL['cancelxml']
headers = self._get_headers_cancel_xml(cfdi, info, auth) headers = self._get_headers_cancel_xml(cfdi, info, auth)
@ -272,9 +273,9 @@ class PACComercioDigital(object):
} }
return data return data
def status(self, data, auth={}): def status(self, data, auth):
if not auth: # ~ if not auth:
auth = AUTH # ~ auth = AUTH
url = self.URL['status'] url = self.URL['status']
data = ( data = (
@ -323,8 +324,8 @@ class PACComercioDigital(object):
return '\n'.join(data) return '\n'.join(data)
def client_add(self, data): def client_add(self, data, auth):
auth = AUTH # ~ auth = AUTH
url = self.URL['client'] url = self.URL['client']
data = self._get_data_client(auth, data) data = self._get_data_client(auth, data)
@ -371,9 +372,9 @@ class PACComercioDigital(object):
return result.text return result.text
def client_add_timbres(self, data, auth={}): def client_add_timbres(self, data, auth):
if not auth: # ~ if not auth:
auth = AUTH # ~ auth = AUTH
url = self.URL['timbres'] url = self.URL['timbres']
data = '\n'.join(( data = '\n'.join((
f"usr_ws={auth['user']}", f"usr_ws={auth['user']}",

View File

@ -779,7 +779,8 @@ def _cancel_with_cert(invoice, args, auth, certificado):
def cancel_xml_sign(invoice, args, auth, certificado): def cancel_xml_sign(invoice, args, auth, certificado):
if DEBUG: # ~ if DEBUG:
if auth['pac'] == 'finkok':
return _cancel_with_cert(invoice, args, auth, certificado) return _cancel_with_cert(invoice, args, auth, certificado)
cert = SATCertificate(certificado.cer, certificado.key_enc.encode()) cert = SATCertificate(certificado.cer, certificado.key_enc.encode())
@ -788,6 +789,7 @@ def cancel_xml_sign(invoice, args, auth, certificado):
'rfc': certificado.rfc, 'rfc': certificado.rfc,
'fecha': now().isoformat()[:19], 'fecha': now().isoformat()[:19],
'uuid': str(invoice.uuid).upper(), 'uuid': str(invoice.uuid).upper(),
'motivo': args['reason'],
} }
template = TEMPLATE_CANCEL.format(**data) template = TEMPLATE_CANCEL.format(**data)
tree = ET.fromstring(template.encode()) tree = ET.fromstring(template.encode())

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# ~ Empresa Libre # ~ Empresa Libre
# ~ Copyright (C) 2016-2018 Mauricio Baeza Servin (web@correolibre.net) # ~ Copyright (C) 2016-2018 Mauricio Baeza Servin (publico@cuates.net)
# ~ # ~
# ~ This program is free software: you can redistribute it and/or modify # ~ This program is free software: you can redistribute it and/or modify
# ~ it under the terms of the GNU General Public License as published by # ~ it under the terms of the GNU General Public License as published by
@ -258,7 +258,7 @@ DEFAULT_GLOBAL = {
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}"> 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> <Folios>
<UUID>{uuid}</UUID> <Folio UUID={uuid} Motivo={motivo}/>
</Folios> </Folios>
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#"> <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
<SignedInfo> <SignedInfo>