From 05d3f617ebf9309a8d0c7ac8a66f61b0f0d574fb Mon Sep 17 00:00:00 2001 From: El Mau Date: Tue, 2 Apr 2024 10:31:28 -0600 Subject: [PATCH] Fix in Carta Porte --- CHANGELOG.md | 4 ++++ VERSION | 2 +- source/app/controllers/util.py | 1 - source/app/models/main.py | 2 ++ source/app/settings.py | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb62838..6d25424 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +v 2.3.1 [02-Abr-2024] + - Fix: En la cantidad de la mercancia en la Carta Porte + + v 2.3.0 [01-Abr-2024] - Mejora: Soporte para complemento Carta Porte 3.0 - **IMPORTANTE**: Aunque no lo uses, esto afecta al JS de facturaciĆ³n, por diff --git a/VERSION b/VERSION index 276cbf9..2bf1c1c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.0 +2.3.1 diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py index 87944ea..1b02046 100644 --- a/source/app/controllers/util.py +++ b/source/app/controllers/util.py @@ -3161,6 +3161,5 @@ def parse_xml2(xml_str): def get_idccp(): uuid4 = str(uuid.uuid4()).upper() custom_uuid_str = f'CCC{uuid4[3:]}' - # ~ custom_uuid_str = f"CCC{uuid_v4.hex[3:8].upper()}-{uuid_v4.hex[8:12].upper()}-{uuid_v4.hex[12:16].upper()}-{uuid_v4.hex[16:20].upper()}-{uuid_v4.hex[20:32].upper()}" return custom_uuid_str diff --git a/source/app/models/main.py b/source/app/models/main.py index 072ca1a..ef96df0 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -5589,6 +5589,8 @@ class Facturas(BaseModel): total_weight += float(mercancia['PesoEnKg']) if isinstance(mercancia['PesoEnKg'], (int, float)): mercancia['PesoEnKg'] = f"{mercancia['PesoEnKg']:.2f}" + if isinstance(mercancia['Cantidad'], str): + mercancia['Cantidad'] = float(mercancia['Cantidad']) mercancia['Cantidad'] = f"{mercancia['Cantidad']:.2f}" info['mercancias'] = {} diff --git a/source/app/settings.py b/source/app/settings.py index 190833e..e7a9898 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -39,7 +39,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '2.3.0' +VERSION = '2.3.1' EMAIL_SUPPORT = ('soporte@empresalibre.mx',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)