diff --git a/CHANGELOG.md b/CHANGELOG.md index caebc4b..39ca823 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +v 2.0.0 [08-Ene-2023] +---------------------- + - Liberamos para todos la versión CFDI 4.0 + - **IMPORTANTE** NO intentes timbrar si **antes** no has validado en nuestro demo que puedes timbrar tus CFDIs habituales. + +* IMPORTANTE: + +Es necesario hacer una migración: + +``` +cd /opt/empresa-libre + +git pull origin master + +cd source/app/models + +python main.py -bk + +python main.py -m -r RFC +``` + +Y reiniciar todo. IMPORTANTE: dependiendo desde que versión actualices, tal vez debas de hacer algún prodecimiento extra. Siempre revisa este historial. + + v 2.0.0 [31-Mar-2022] ---------------------- - Primera versión de timbrado con CFDI4 diff --git a/source/app/controllers/main.py b/source/app/controllers/main.py index 1981b6e..522de05 100644 --- a/source/app/controllers/main.py +++ b/source/app/controllers/main.py @@ -548,6 +548,9 @@ class AppDocumentos(object): if not type_doc in ('pdf', 'pre', 'tpdf', 'pdfpago', 'html'): resp.append_header('Content-Disposition', 'attachment; filename={}'.format(file_name)) + if type_doc in ('pdf',): + resp.append_header('Content-Disposition', + 'inline; filename={}'.format(file_name)) resp.content_type = content_type resp.status = falcon.HTTP_200 diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py index 407158d..ab69c10 100644 --- a/source/app/controllers/util.py +++ b/source/app/controllers/util.py @@ -1569,6 +1569,9 @@ def to_pdf(data, emisor_rfc, ods=False, pdf_from='1'): version = data['comprobante']['version'] default = f'plantilla_factura_{version}.ods' + if pdf_from == '2': + return to_pdf_from_json(rfc, version, data) + if 'nomina' in data and data['nomina']: version_nomina = data['nomina']['version'] default = f'plantilla_nomina_{version}_{version_nomina}.ods' @@ -1583,12 +1586,10 @@ def to_pdf(data, emisor_rfc, ods=False, pdf_from='1'): default = f'plantilla_pagos_{version}_{version_pagos}.ods' version = f'{version}_cp_{version_pagos}' - if pdf_from == '2': - return to_pdf_from_json(rfc, version, data) - - donativo = '' if data['donativo']: - donativo = '_donativo' + version_donatarias = data['donataria']['version'] + default = f'plantilla_donatarias_{version}_{version_donatarias}.ods' + version = f'{version}_cd_{version_donatarias}' template_name = f'{rfc.lower()}_{version}.ods' # ~ print('T', template_name, default) diff --git a/source/app/models/main.py b/source/app/models/main.py index 85a73d7..5416005 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -6643,6 +6643,7 @@ class PreFacturas(BaseModel): obj = PreFacturas.get(PreFacturas.id==id) name = '{}{}_{}.pdf'.format(obj.serie, obj.folio, obj.cliente.rfc) data = cls._get_info_to_pdf(cls, id) + data['informacion_global'] = {} doc = util.to_pdf(data, data['emisor']['rfc']) return doc, name diff --git a/source/templates/plantilla_donatarias_4.0_1.1.ods b/source/templates/plantilla_donatarias_4.0_1.1.ods new file mode 100644 index 0000000..d17e1f9 Binary files /dev/null and b/source/templates/plantilla_donatarias_4.0_1.1.ods differ