diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f7723..af3489b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +v 2.0.5 [05-Jun-2023] +--------------------- + - Fix: Al generar complementos de pago con facturas con varios impuestos. + - Fix: ticket #103, hay que usar {receptor.correo_facturas} y {receptor.telefonos} + + v 2.0.2 [01-Abr-2023] --------------------- - Fix: Obtener la clave del sat al facturar por lote. diff --git a/VERSION b/VERSION index 2165f8f..e010258 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.4 +2.0.5 diff --git a/source/app/models/main.py b/source/app/models/main.py index 39f2da6..696ecf8 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -4821,6 +4821,8 @@ class Facturas(BaseModel): Socios.municipio, Socios.estado, Socios.pais, + Socios.correo_facturas, + Socios.telefonos, ) where = (Socios.id==invoice.cliente.id) partner = Socios.select(*fields).where(where).dicts()[0] @@ -7664,8 +7666,8 @@ class CfdiPagos(BaseModel): "TasaOCuotaDR": str(tax.impuesto.tasa), "ImporteDR": xml_importe, } - - tax_key = tax.impuesto.key + # ~ tax_key = tax.impuesto.key + tax_key = f"{values['ImpuestoDR']}|{values['TasaOCuotaDR']}" if tax.impuesto.tipo == 'T': traslados.append(values) if tax_key in taxes_pay['traslados']: diff --git a/source/app/settings.py b/source/app/settings.py index 706b971..6c238f5 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -28,7 +28,7 @@ from conf import DEBUG, MV, LOG_PATH try: from conf import DEFAULT_PASSWORD except ImportError: - DEFAULT_PASSWORD = 'salgueiro3.3' + DEFAULT_PASSWORD = 'salgueiro4.0' try: from conf import TITLE_APP @@ -42,7 +42,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '2.0.4' +VERSION = '2.0.5' EMAIL_SUPPORT = ('soporte@empresalibre.mx',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION) diff --git a/source/templates/plantilla_factura_4.0.ods b/source/templates/plantilla_factura_4.0.ods index bf9585a..91e7fd2 100644 Binary files a/source/templates/plantilla_factura_4.0.ods and b/source/templates/plantilla_factura_4.0.ods differ